Passed
Push — feature/rebusify ( 639d49...fe0687 )
by Paul
04:51
created
plugin/Handlers/ChangeStatus.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -11,21 +11,21 @@  discard block
 block discarded – undo
11 11
     /**
12 12
      * @return array
13 13
      */
14
-    public function handle(Command $command)
14
+    public function handle( Command $command )
15 15
     {
16
-        $postId = wp_update_post([
16
+        $postId = wp_update_post( [
17 17
             'ID' => $command->id,
18 18
             'post_status' => $command->status,
19
-        ]);
20
-        if (is_wp_error($postId)) {
21
-            glsr_log()->error($postId->get_error_message());
19
+        ] );
20
+        if( is_wp_error( $postId ) ) {
21
+            glsr_log()->error( $postId->get_error_message() );
22 22
             return [];
23 23
         }
24 24
         return [
25 25
             'class' => 'status-'.$command->status,
26 26
             'counts' => $this->getStatusLinks(),
27
-            'link' => $this->getPostLink($postId).$this->getPostState($postId),
28
-            'pending' => wp_count_posts(Application::POST_TYPE, 'readable')->pending,
27
+            'link' => $this->getPostLink( $postId ).$this->getPostState( $postId ),
28
+            'pending' => wp_count_posts( Application::POST_TYPE, 'readable' )->pending,
29 29
         ];
30 30
     }
31 31
 
@@ -33,24 +33,24 @@  discard block
 block discarded – undo
33 33
      * @param int $postId
34 34
      * @return string
35 35
      */
36
-    protected function getPostLink($postId)
36
+    protected function getPostLink( $postId )
37 37
     {
38
-        $title = _draft_or_post_title($postId);
39
-        return glsr(Builder::class)->a($title, [
40
-            'aria-label' => '“'.esc_attr($title).'” ('.__('Edit', 'site-reviews').')',
38
+        $title = _draft_or_post_title( $postId );
39
+        return glsr( Builder::class )->a( $title, [
40
+            'aria-label' => '“'.esc_attr( $title ).'” ('.__( 'Edit', 'site-reviews' ).')',
41 41
             'class' => 'row-title',
42
-            'href' => get_edit_post_link($postId),
43
-        ]);
42
+            'href' => get_edit_post_link( $postId ),
43
+        ] );
44 44
     }
45 45
 
46 46
     /**
47 47
      * @param int $postId
48 48
      * @return string
49 49
      */
50
-    protected function getPostState($postId)
50
+    protected function getPostState( $postId )
51 51
     {
52 52
         ob_start();
53
-        _post_states(get_post($postId));
53
+        _post_states( get_post( $postId ) );
54 54
         return ob_get_clean();
55 55
     }
56 56
 
@@ -62,16 +62,16 @@  discard block
 block discarded – undo
62 62
         global $avail_post_stati;
63 63
         require_once ABSPATH.'wp-admin/includes/class-wp-posts-list-table.php';
64 64
         $hookName = 'edit-'.Application::POST_TYPE;
65
-        set_current_screen($hookName);
66
-        $avail_post_stati = get_available_post_statuses(Application::POST_TYPE);
67
-        $table = new \WP_Posts_List_Table(['screen' => $hookName]);
68
-        $views = apply_filters('views_'.$hookName, $table->get_views()); // uses compat get_views()
69
-        if (empty($views)) {
65
+        set_current_screen( $hookName );
66
+        $avail_post_stati = get_available_post_statuses( Application::POST_TYPE );
67
+        $table = new \WP_Posts_List_Table( ['screen' => $hookName] );
68
+        $views = apply_filters( 'views_'.$hookName, $table->get_views() ); // uses compat get_views()
69
+        if( empty($views) ) {
70 70
             return;
71 71
         }
72
-        foreach ($views as $class => $view) {
72
+        foreach( $views as $class => $view ) {
73 73
             $views[$class] = "\t<li class='$class'>$view";
74 74
         }
75
-        return implode(' |</li>', $views).'</li>';
75
+        return implode( ' |</li>', $views ).'</li>';
76 76
     }
77 77
 }
Please login to merge, or discard this patch.
plugin/Handlers/CreateReview.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -11,35 +11,35 @@
 block discarded – undo
11 11
     /**
12 12
      * @return void|string
13 13
      */
14
-    public function handle(Command $command)
14
+    public function handle( Command $command )
15 15
     {
16
-        $review = glsr(ReviewManager::class)->create($command);
17
-        if (!$review) {
18
-            glsr()->sessionSet($command->form_id.'errors', []);
19
-            glsr()->sessionSet($command->form_id.'message', __('Your review could not be submitted and the error has been logged. Please notify the site admin.', 'site-reviews'));
16
+        $review = glsr( ReviewManager::class )->create( $command );
17
+        if( !$review ) {
18
+            glsr()->sessionSet( $command->form_id.'errors', [] );
19
+            glsr()->sessionSet( $command->form_id.'message', __( 'Your review could not be submitted and the error has been logged. Please notify the site admin.', 'site-reviews' ) );
20 20
             return;
21 21
         }
22
-        glsr()->sessionSet($command->form_id.'message', __('Your review has been submitted!', 'site-reviews'));
23
-        glsr(Notification::class)->send($review);
24
-        if ($command->ajax_request) {
22
+        glsr()->sessionSet( $command->form_id.'message', __( 'Your review has been submitted!', 'site-reviews' ) );
23
+        glsr( Notification::class )->send( $review );
24
+        if( $command->ajax_request ) {
25 25
             return;
26 26
         }
27
-        wp_safe_redirect($this->getReferer($command));
27
+        wp_safe_redirect( $this->getReferer( $command ) );
28 28
         exit;
29 29
     }
30 30
 
31 31
     /**
32 32
      * @return string
33 33
      */
34
-    protected function getReferer(Command $command)
34
+    protected function getReferer( Command $command )
35 35
     {
36
-        $referer = trim(strval(get_post_meta($command->post_id, 'redirect_to', true)));
37
-        $referer = apply_filters('site-reviews/review/redirect', $referer, $command);
38
-        if (empty($referer)) {
36
+        $referer = trim( strval( get_post_meta( $command->post_id, 'redirect_to', true ) ) );
37
+        $referer = apply_filters( 'site-reviews/review/redirect', $referer, $command );
38
+        if( empty($referer) ) {
39 39
             $referer = $command->referer;
40 40
         }
41
-        if (empty($referer)) {
42
-            glsr_log()->warning('The form referer ($_SERVER[REQUEST_URI]) was empty.')->debug($command);
41
+        if( empty($referer) ) {
42
+            glsr_log()->warning( 'The form referer ($_SERVER[REQUEST_URI]) was empty.' )->debug( $command );
43 43
             $referer = home_url();
44 44
         }
45 45
         return $referer;
Please login to merge, or discard this patch.
deprecated.php 1 patch
Spacing   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -1,134 +1,134 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-defined('WPINC') || die;
3
+defined( 'WPINC' ) || die;
4 4
 
5 5
 // Unprotected review meta has been deprecated
6
-add_filter('get_post_metadata', function ($check, $postId, $metaKey, $single) {
7
-    $metaKeys = array_keys(glsr('Defaults\CreateReviewDefaults')->defaults());
8
-    if (!in_array($metaKey, $metaKeys) || glsr()->post_type != get_post_type($postId)) {
6
+add_filter( 'get_post_metadata', function( $check, $postId, $metaKey, $single ) {
7
+    $metaKeys = array_keys( glsr( 'Defaults\CreateReviewDefaults' )->defaults() );
8
+    if( !in_array( $metaKey, $metaKeys ) || glsr()->post_type != get_post_type( $postId ) ) {
9 9
         return $check;
10 10
     }
11 11
     glsr()->deprecated[] = sprintf(
12 12
         'The "%1$s" meta_key has been deprecated for Reviews. Please use the protected "_%1$s" meta_key instead.',
13 13
         $metaKey
14 14
     );
15
-    return get_post_meta($postId, '_'.$metaKey, $single);
16
-}, 10, 4);
15
+    return get_post_meta( $postId, '_'.$metaKey, $single );
16
+}, 10, 4 );
17 17
 
18 18
 // Modules/Html/Template.php
19
-add_filter('site-reviews/interpolate/reviews', function ($context, $template) {
19
+add_filter( 'site-reviews/interpolate/reviews', function( $context, $template ) {
20 20
     $search = '{{ navigation }}';
21
-    if (false !== strpos($template, $search)) {
21
+    if( false !== strpos( $template, $search ) ) {
22 22
         $context['navigation'] = $context['pagination'];
23 23
         glsr()->deprecated[] = 'The {{ navigation }} template key in "YOUR_THEME/site-reviews/reviews.php" has been deprecated. Please use the {{ pagination }} template key instead.';
24 24
     }
25 25
     return $context;
26
-}, 10, 2);
26
+}, 10, 2 );
27 27
 
28 28
 // Database/ReviewManager.php
29
-add_action('site-reviews/review/created', function ($review) {
30
-    if (has_action('site-reviews/local/review/create')) {
29
+add_action( 'site-reviews/review/created', function( $review ) {
30
+    if( has_action( 'site-reviews/local/review/create' ) ) {
31 31
         glsr()->deprecated[] = 'The "site-reviews/local/review/create" hook has been deprecated. Please use the "site-reviews/review/created" hook instead.';
32
-        do_action('site-reviews/local/review/create', (array) get_post($review->ID), (array) $review, $review->ID);
32
+        do_action( 'site-reviews/local/review/create', (array)get_post( $review->ID ), (array)$review, $review->ID );
33 33
     }
34
-}, 9);
34
+}, 9 );
35 35
 
36 36
 // Handlers/CreateReview.php
37
-add_action('site-reviews/review/submitted', function ($review) {
38
-    if (has_action('site-reviews/local/review/submitted')) {
37
+add_action( 'site-reviews/review/submitted', function( $review ) {
38
+    if( has_action( 'site-reviews/local/review/submitted' ) ) {
39 39
         glsr()->deprecated[] = 'The "site-reviews/local/review/submitted" hook has been deprecated. Please use the "site-reviews/review/submitted" hook instead.';
40
-        do_action('site-reviews/local/review/submitted', null, $review);
40
+        do_action( 'site-reviews/local/review/submitted', null, $review );
41 41
     }
42
-    if (has_filter('site-reviews/local/review/submitted/message')) {
42
+    if( has_filter( 'site-reviews/local/review/submitted/message' ) ) {
43 43
         glsr()->deprecated[] = 'The "site-reviews/local/review/submitted/message" hook has been deprecated.';
44 44
     }
45
-}, 9);
45
+}, 9 );
46 46
 
47 47
 // Database/ReviewManager.php
48
-add_filter('site-reviews/create/review-values', function ($values, $command) {
49
-    if (has_filter('site-reviews/local/review')) {
48
+add_filter( 'site-reviews/create/review-values', function( $values, $command ) {
49
+    if( has_filter( 'site-reviews/local/review' ) ) {
50 50
         glsr()->deprecated[] = 'The "site-reviews/local/review" hook has been deprecated. Please use the "site-reviews/create/review-values" hook instead.';
51
-        return apply_filters('site-reviews/local/review', $values, $command);
51
+        return apply_filters( 'site-reviews/local/review', $values, $command );
52 52
     }
53 53
     return $values;
54
-}, 9, 2);
54
+}, 9, 2 );
55 55
 
56 56
 // Handlers/EnqueuePublicAssets.php
57
-add_filter('site-reviews/enqueue/public/localize', function ($variables) {
58
-    if (has_filter('site-reviews/enqueue/localize')) {
57
+add_filter( 'site-reviews/enqueue/public/localize', function( $variables ) {
58
+    if( has_filter( 'site-reviews/enqueue/localize' ) ) {
59 59
         glsr()->deprecated[] = 'The "site-reviews/enqueue/localize" hook has been deprecated. Please use the "site-reviews/enqueue/public/localize" hook instead.';
60
-        return apply_filters('site-reviews/enqueue/localize', $variables);
60
+        return apply_filters( 'site-reviews/enqueue/localize', $variables );
61 61
     }
62 62
     return $variables;
63
-}, 9);
63
+}, 9 );
64 64
 
65 65
 // Modules/Rating.php
66
-add_filter('site-reviews/rating/average', function ($average) {
67
-    if (has_filter('site-reviews/average/rating')) {
66
+add_filter( 'site-reviews/rating/average', function( $average ) {
67
+    if( has_filter( 'site-reviews/average/rating' ) ) {
68 68
         glsr()->deprecated[] = 'The "site-reviews/average/rating" hook has been deprecated. Please use the "site-reviews/rating/average" hook instead.';
69 69
     }
70 70
     return $average;
71
-}, 9);
71
+}, 9 );
72 72
 
73 73
 // Modules/Rating.php
74
-add_filter('site-reviews/rating/ranking', function ($ranking) {
75
-    if (has_filter('site-reviews/bayesian/ranking')) {
74
+add_filter( 'site-reviews/rating/ranking', function( $ranking ) {
75
+    if( has_filter( 'site-reviews/bayesian/ranking' ) ) {
76 76
         glsr()->deprecated[] = 'The "site-reviews/bayesian/ranking" hook has been deprecated. Please use the "site-reviews/rating/ranking" hook instead.';
77 77
     }
78 78
     return $ranking;
79
-}, 9);
79
+}, 9 );
80 80
 
81 81
 // Modules/Html/Partials/SiteReviews.php
82
-add_filter('site-reviews/review/build/after', function ($renderedFields) {
83
-    if (has_filter('site-reviews/reviews/review/text')) {
82
+add_filter( 'site-reviews/review/build/after', function( $renderedFields ) {
83
+    if( has_filter( 'site-reviews/reviews/review/text' ) ) {
84 84
         glsr()->deprecated[] = 'The "site-reviews/reviews/review/text" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.';
85 85
     }
86
-    if (has_filter('site-reviews/reviews/review/title')) {
86
+    if( has_filter( 'site-reviews/reviews/review/title' ) ) {
87 87
         glsr()->deprecated[] = 'The "site-reviews/reviews/review/title" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.';
88 88
     }
89 89
     return $renderedFields;
90
-}, 9);
90
+}, 9 );
91 91
 
92 92
 // Modules/Html/Partials/SiteReviews.php
93
-add_filter('site-reviews/review/build/before', function ($review) {
94
-    if (has_filter('site-reviews/rendered/review')) {
93
+add_filter( 'site-reviews/review/build/before', function( $review ) {
94
+    if( has_filter( 'site-reviews/rendered/review' ) ) {
95 95
         glsr()->deprecated[] = 'The "site-reviews/rendered/review" hook has been deprecated. Please either use a custom "review.php" template (refer to the documentation), or use the "site-reviews/review/build/after" hook instead.';
96 96
     }
97
-    if (has_filter('site-reviews/rendered/review/meta/order')) {
97
+    if( has_filter( 'site-reviews/rendered/review/meta/order' ) ) {
98 98
         glsr()->deprecated[] = 'The "site-reviews/rendered/review/meta/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).';
99 99
     }
100
-    if (has_filter('site-reviews/rendered/review/order')) {
100
+    if( has_filter( 'site-reviews/rendered/review/order' ) ) {
101 101
         glsr()->deprecated[] = 'The "site-reviews/rendered/review/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).';
102 102
     }
103
-    if (has_filter('site-reviews/rendered/review-form/login-register')) {
103
+    if( has_filter( 'site-reviews/rendered/review-form/login-register' ) ) {
104 104
         glsr()->deprecated[] = 'The "site-reviews/rendered/review-form/login-register" hook has been deprecated. Please use a custom "login-register.php" template instead (refer to the documentation).';
105 105
     }
106
-    if (has_filter('site-reviews/reviews/navigation_links')) {
106
+    if( has_filter( 'site-reviews/reviews/navigation_links' ) ) {
107 107
         glsr()->deprecated[] = 'The "site-reviews/reviews/navigation_links" hook has been deprecated. Please use a custom "pagination.php" template instead (refer to the documentation).';
108 108
     }
109 109
     return $review;
110
-}, 9);
110
+}, 9 );
111 111
 
112
-add_filter('site-reviews/validate/custom', function ($result, $request) {
113
-    if (has_filter('site-reviews/validate/review/submission')) {
114
-        glsr_log()->warning('The "site-reviews/validate/review/submission" hook has been deprecated. Please use the "site-reviews/validate/custom" hook instead.');
115
-        return apply_filters('site-reviews/validate/review/submission', $result, $request);
112
+add_filter( 'site-reviews/validate/custom', function( $result, $request ) {
113
+    if( has_filter( 'site-reviews/validate/review/submission' ) ) {
114
+        glsr_log()->warning( 'The "site-reviews/validate/review/submission" hook has been deprecated. Please use the "site-reviews/validate/custom" hook instead.' );
115
+        return apply_filters( 'site-reviews/validate/review/submission', $result, $request );
116 116
     }
117 117
     return $result;
118
-}, 9, 2);
118
+}, 9, 2 );
119 119
 
120
-add_filter('site-reviews/views/file', function ($file, $view, $data) {
121
-    if (has_filter('site-reviews/addon/views/file')) {
120
+add_filter( 'site-reviews/views/file', function( $file, $view, $data ) {
121
+    if( has_filter( 'site-reviews/addon/views/file' ) ) {
122 122
         glsr()->deprecated[] = 'The "site-reviews/addon/views/file" hook has been deprecated. Please use the "site-reviews/views/file" hook instead.';
123
-        $file = apply_filters('site-reviews/addon/views/file', $file, $view, $data);
123
+        $file = apply_filters( 'site-reviews/addon/views/file', $file, $view, $data );
124 124
     }
125 125
     return $file;
126
-}, 9, 3);
126
+}, 9, 3 );
127 127
 
128
-add_action('wp_footer', function () {
129
-    $notices = array_keys(array_flip(glsr()->deprecated));
130
-    natsort($notices);
131
-    foreach ($notices as $notice) {
132
-        glsr_log()->warning($notice);
128
+add_action( 'wp_footer', function() {
129
+    $notices = array_keys( array_flip( glsr()->deprecated ) );
130
+    natsort( $notices );
131
+    foreach( $notices as $notice ) {
132
+        glsr_log()->warning( $notice );
133 133
     }
134 134
 });
Please login to merge, or discard this patch.
plugin/Widgets/SiteReviewsWidget.php 1 patch
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -11,65 +11,65 @@  discard block
 block discarded – undo
11 11
      * @param array $instance
12 12
      * @return void
13 13
      */
14
-    public function form($instance)
14
+    public function form( $instance )
15 15
     {
16
-        $this->widgetArgs = glsr(SiteReviewsShortcode::class)->normalizeAtts($instance);
17
-        $terms = glsr(Database::class)->getTerms();
18
-        $this->renderField('text', [
16
+        $this->widgetArgs = glsr( SiteReviewsShortcode::class )->normalizeAtts( $instance );
17
+        $terms = glsr( Database::class )->getTerms();
18
+        $this->renderField( 'text', [
19 19
             'class' => 'widefat',
20
-            'label' => __('Title', 'site-reviews'),
20
+            'label' => __( 'Title', 'site-reviews' ),
21 21
             'name' => 'title',
22
-        ]);
23
-        $this->renderField('number', [
22
+        ] );
23
+        $this->renderField( 'number', [
24 24
             'class' => 'small-text',
25 25
             'default' => 5,
26
-            'label' => __('How many reviews would you like to display?', 'site-reviews'),
26
+            'label' => __( 'How many reviews would you like to display?', 'site-reviews' ),
27 27
             'max' => 100,
28 28
             'name' => 'count',
29
-        ]);
30
-        $this->renderField('select', [
31
-            'label' => __('What is the minimum rating to display?', 'site-reviews'),
29
+        ] );
30
+        $this->renderField( 'select', [
31
+            'label' => __( 'What is the minimum rating to display?', 'site-reviews' ),
32 32
             'name' => 'rating',
33 33
             'options' => [
34
-                '5' => sprintf(_n('%s star', '%s stars', 5, 'site-reviews'), 5),
35
-                '4' => sprintf(_n('%s star', '%s stars', 4, 'site-reviews'), 4),
36
-                '3' => sprintf(_n('%s star', '%s stars', 3, 'site-reviews'), 3),
37
-                '2' => sprintf(_n('%s star', '%s stars', 2, 'site-reviews'), 2),
38
-                '1' => sprintf(_n('%s star', '%s stars', 1, 'site-reviews'), 1),
34
+                '5' => sprintf( _n( '%s star', '%s stars', 5, 'site-reviews' ), 5 ),
35
+                '4' => sprintf( _n( '%s star', '%s stars', 4, 'site-reviews' ), 4 ),
36
+                '3' => sprintf( _n( '%s star', '%s stars', 3, 'site-reviews' ), 3 ),
37
+                '2' => sprintf( _n( '%s star', '%s stars', 2, 'site-reviews' ), 2 ),
38
+                '1' => sprintf( _n( '%s star', '%s stars', 1, 'site-reviews' ), 1 ),
39 39
             ],
40
-        ]);
41
-        if (count(glsr()->reviewTypes) > 1) {
42
-            $this->renderField('select', [
40
+        ] );
41
+        if( count( glsr()->reviewTypes ) > 1 ) {
42
+            $this->renderField( 'select', [
43 43
                 'class' => 'widefat',
44
-                'label' => __('Which type of review would you like to display?', 'site-reviews'),
44
+                'label' => __( 'Which type of review would you like to display?', 'site-reviews' ),
45 45
                 'name' => 'type',
46
-                'options' => ['' => __('All Reviews', 'site-reviews')] + glsr()->reviewTypes,
47
-            ]);
46
+                'options' => ['' => __( 'All Reviews', 'site-reviews' )] + glsr()->reviewTypes,
47
+            ] );
48 48
         }
49
-        if (!empty($terms)) {
50
-            $this->renderField('select', [
49
+        if( !empty($terms) ) {
50
+            $this->renderField( 'select', [
51 51
                 'class' => 'widefat',
52
-                'label' => __('Limit reviews to this category', 'site-reviews'),
52
+                'label' => __( 'Limit reviews to this category', 'site-reviews' ),
53 53
                 'name' => 'category',
54
-                'options' => ['' => __('All Categories', 'site-reviews')] + $terms,
55
-            ]);
54
+                'options' => ['' => __( 'All Categories', 'site-reviews' )] + $terms,
55
+            ] );
56 56
         }
57
-        $this->renderField('text', [
57
+        $this->renderField( 'text', [
58 58
             'class' => 'widefat',
59 59
             'default' => '',
60
-            'description' => sprintf(__("Separate multiple ID's with a comma. You may also enter %s to automatically represent the current page/post ID.", 'site-reviews'), '<code>post_id</code>'),
61
-            'label' => __('Limit reviews to those assigned to this page/post ID', 'site-reviews'),
60
+            'description' => sprintf( __( "Separate multiple ID's with a comma. You may also enter %s to automatically represent the current page/post ID.", 'site-reviews' ), '<code>post_id</code>' ),
61
+            'label' => __( 'Limit reviews to those assigned to this page/post ID', 'site-reviews' ),
62 62
             'name' => 'assigned_to',
63
-        ]);
64
-        $this->renderField('text', [
63
+        ] );
64
+        $this->renderField( 'text', [
65 65
             'class' => 'widefat',
66
-            'label' => __('Enter any custom CSS classes here', 'site-reviews'),
66
+            'label' => __( 'Enter any custom CSS classes here', 'site-reviews' ),
67 67
             'name' => 'class',
68
-        ]);
69
-        $this->renderField('checkbox', [
68
+        ] );
69
+        $this->renderField( 'checkbox', [
70 70
             'name' => 'hide',
71
-            'options' => glsr(SiteReviewsShortcode::class)->getHideOptions(),
72
-        ]);
71
+            'options' => glsr( SiteReviewsShortcode::class )->getHideOptions(),
72
+        ] );
73 73
     }
74 74
 
75 75
     /**
@@ -77,13 +77,13 @@  discard block
 block discarded – undo
77 77
      * @param array $oldInstance
78 78
      * @return array
79 79
      */
80
-    public function update($newInstance, $oldInstance)
80
+    public function update( $newInstance, $oldInstance )
81 81
     {
82
-        if (!is_numeric($newInstance['count'])) {
82
+        if( !is_numeric( $newInstance['count'] ) ) {
83 83
             $newInstance['count'] = 10;
84 84
         }
85
-        $newInstance['count'] = min(50, max(0, intval($newInstance['count'])));
86
-        return parent::update($newInstance, $oldInstance);
85
+        $newInstance['count'] = min( 50, max( 0, intval( $newInstance['count'] ) ) );
86
+        return parent::update( $newInstance, $oldInstance );
87 87
     }
88 88
 
89 89
     /**
@@ -91,8 +91,8 @@  discard block
 block discarded – undo
91 91
      * @param array $instance
92 92
      * @return void
93 93
      */
94
-    public function widget($args, $instance)
94
+    public function widget( $args, $instance )
95 95
     {
96
-        echo glsr(SiteReviewsShortcode::class)->build($instance, $args, 'widget');
96
+        echo glsr( SiteReviewsShortcode::class )->build( $instance, $args, 'widget' );
97 97
     }
98 98
 }
Please login to merge, or discard this patch.
plugin/Widgets/SiteReviewsFormWidget.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -11,42 +11,42 @@  discard block
 block discarded – undo
11 11
      * @param array $instance
12 12
      * @return void
13 13
      */
14
-    public function form($instance)
14
+    public function form( $instance )
15 15
     {
16
-        $this->widgetArgs = glsr(SiteReviewsFormShortcode::class)->normalizeAtts($instance);
17
-        $terms = glsr(Database::class)->getTerms();
18
-        $this->renderField('text', [
16
+        $this->widgetArgs = glsr( SiteReviewsFormShortcode::class )->normalizeAtts( $instance );
17
+        $terms = glsr( Database::class )->getTerms();
18
+        $this->renderField( 'text', [
19 19
             'class' => 'widefat',
20
-            'label' => __('Title', 'site-reviews'),
20
+            'label' => __( 'Title', 'site-reviews' ),
21 21
             'name' => 'title',
22
-        ]);
23
-        $this->renderField('textarea', [
22
+        ] );
23
+        $this->renderField( 'textarea', [
24 24
             'class' => 'widefat',
25
-            'label' => __('Description', 'site-reviews'),
25
+            'label' => __( 'Description', 'site-reviews' ),
26 26
             'name' => 'description',
27
-        ]);
28
-        $this->renderField('select', [
27
+        ] );
28
+        $this->renderField( 'select', [
29 29
             'class' => 'widefat',
30
-            'label' => __('Automatically assign a category', 'site-reviews'),
30
+            'label' => __( 'Automatically assign a category', 'site-reviews' ),
31 31
             'name' => 'category',
32
-            'options' => ['' => __('Do not assign a category', 'site-reviews')] + $terms,
33
-        ]);
34
-        $this->renderField('text', [
32
+            'options' => ['' => __( 'Do not assign a category', 'site-reviews' )] + $terms,
33
+        ] );
34
+        $this->renderField( 'text', [
35 35
             'class' => 'widefat',
36 36
             'default' => '',
37
-            'description' => sprintf(__('You may also enter %s to assign to the current post.', 'site-reviews'), '<code>post_id</code>'),
38
-            'label' => __('Assign reviews to a custom page/post ID', 'site-reviews'),
37
+            'description' => sprintf( __( 'You may also enter %s to assign to the current post.', 'site-reviews' ), '<code>post_id</code>' ),
38
+            'label' => __( 'Assign reviews to a custom page/post ID', 'site-reviews' ),
39 39
             'name' => 'assign_to',
40
-        ]);
41
-        $this->renderField('text', [
40
+        ] );
41
+        $this->renderField( 'text', [
42 42
             'class' => 'widefat',
43
-            'label' => __('Enter any custom CSS classes here', 'site-reviews'),
43
+            'label' => __( 'Enter any custom CSS classes here', 'site-reviews' ),
44 44
             'name' => 'class',
45
-        ]);
46
-        $this->renderField('checkbox', [
45
+        ] );
46
+        $this->renderField( 'checkbox', [
47 47
             'name' => 'hide',
48
-            'options' => glsr(SiteReviewsFormShortcode::class)->getHideOptions(),
49
-        ]);
48
+            'options' => glsr( SiteReviewsFormShortcode::class )->getHideOptions(),
49
+        ] );
50 50
     }
51 51
 
52 52
     /**
@@ -54,8 +54,8 @@  discard block
 block discarded – undo
54 54
      * @param array $instance
55 55
      * @return void
56 56
      */
57
-    public function widget($args, $instance)
57
+    public function widget( $args, $instance )
58 58
     {
59
-        echo glsr(SiteReviewsFormShortcode::class)->build($instance, $args, 'widget');
59
+        echo glsr( SiteReviewsFormShortcode::class )->build( $instance, $args, 'widget' );
60 60
     }
61 61
 }
Please login to merge, or discard this patch.
plugin/Widgets/SiteReviewsSummaryWidget.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -11,47 +11,47 @@  discard block
 block discarded – undo
11 11
      * @param array $instance
12 12
      * @return void
13 13
      */
14
-    public function form($instance)
14
+    public function form( $instance )
15 15
     {
16
-        $this->widgetArgs = glsr(SiteReviewsSummaryShortcode::class)->normalizeAtts($instance);
17
-        $terms = glsr(Database::class)->getTerms();
18
-        $this->renderField('text', [
16
+        $this->widgetArgs = glsr( SiteReviewsSummaryShortcode::class )->normalizeAtts( $instance );
17
+        $terms = glsr( Database::class )->getTerms();
18
+        $this->renderField( 'text', [
19 19
             'class' => 'widefat',
20
-            'label' => __('Title', 'site-reviews'),
20
+            'label' => __( 'Title', 'site-reviews' ),
21 21
             'name' => 'title',
22
-        ]);
23
-        if (count(glsr()->reviewTypes) > 1) {
24
-            $this->renderField('select', [
22
+        ] );
23
+        if( count( glsr()->reviewTypes ) > 1 ) {
24
+            $this->renderField( 'select', [
25 25
                 'class' => 'widefat',
26
-                'label' => __('Which type of review would you like to use?', 'site-reviews'),
26
+                'label' => __( 'Which type of review would you like to use?', 'site-reviews' ),
27 27
                 'name' => 'type',
28
-                'options' => ['' => __('All review types', 'site-reviews')] + glsr()->reviewTypes,
29
-            ]);
28
+                'options' => ['' => __( 'All review types', 'site-reviews' )] + glsr()->reviewTypes,
29
+            ] );
30 30
         }
31
-        if (!empty($terms)) {
32
-            $this->renderField('select', [
31
+        if( !empty($terms) ) {
32
+            $this->renderField( 'select', [
33 33
                 'class' => 'widefat',
34
-                'label' => __('Limit summary to this category', 'site-reviews'),
34
+                'label' => __( 'Limit summary to this category', 'site-reviews' ),
35 35
                 'name' => 'category',
36
-                'options' => ['' => __('All Categories', 'site-reviews')] + $terms,
37
-            ]);
36
+                'options' => ['' => __( 'All Categories', 'site-reviews' )] + $terms,
37
+            ] );
38 38
         }
39
-        $this->renderField('text', [
39
+        $this->renderField( 'text', [
40 40
             'class' => 'widefat',
41 41
             'default' => '',
42
-            'description' => sprintf(__("Separate multiple ID's with a comma. You may also enter %s to automatically represent the current page/post ID.", 'site-reviews'), '<code>post_id</code>'),
43
-            'label' => __('Limit summary to reviews assigned to a page/post ID', 'site-reviews'),
42
+            'description' => sprintf( __( "Separate multiple ID's with a comma. You may also enter %s to automatically represent the current page/post ID.", 'site-reviews' ), '<code>post_id</code>' ),
43
+            'label' => __( 'Limit summary to reviews assigned to a page/post ID', 'site-reviews' ),
44 44
             'name' => 'assigned_to',
45
-        ]);
46
-        $this->renderField('text', [
45
+        ] );
46
+        $this->renderField( 'text', [
47 47
             'class' => 'widefat',
48
-            'label' => __('Enter any custom CSS classes here', 'site-reviews'),
48
+            'label' => __( 'Enter any custom CSS classes here', 'site-reviews' ),
49 49
             'name' => 'class',
50
-        ]);
51
-        $this->renderField('checkbox', [
50
+        ] );
51
+        $this->renderField( 'checkbox', [
52 52
             'name' => 'hide',
53
-            'options' => glsr(SiteReviewsSummaryShortcode::class)->getHideOptions(),
54
-        ]);
53
+            'options' => glsr( SiteReviewsSummaryShortcode::class )->getHideOptions(),
54
+        ] );
55 55
     }
56 56
 
57 57
     /**
@@ -59,8 +59,8 @@  discard block
 block discarded – undo
59 59
      * @param array $instance
60 60
      * @return void
61 61
      */
62
-    public function widget($args, $instance)
62
+    public function widget( $args, $instance )
63 63
     {
64
-        echo glsr(SiteReviewsSummaryShortcode::class)->build($instance, $args, 'widget');
64
+        echo glsr( SiteReviewsSummaryShortcode::class )->build( $instance, $args, 'widget' );
65 65
     }
66 66
 }
Please login to merge, or discard this patch.
plugin/Router.php 1 patch
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -13,9 +13,9 @@  discard block
 block discarded – undo
13 13
 
14 14
     public function __construct()
15 15
     {
16
-        $this->unguardedActions = apply_filters('site-reviews/router/unguarded-actions', [
16
+        $this->unguardedActions = apply_filters( 'site-reviews/router/unguarded-actions', [
17 17
             'fetch-paged-reviews',
18
-        ]);
18
+        ] );
19 19
     }
20 20
 
21 21
     /**
@@ -24,11 +24,11 @@  discard block
 block discarded – undo
24 24
     public function routeAdminPostRequest()
25 25
     {
26 26
         $request = $this->getRequest();
27
-        if (!$this->isValidPostRequest($request)) {
27
+        if( !$this->isValidPostRequest( $request ) ) {
28 28
             return;
29 29
         }
30
-        check_admin_referer($request['_action']);
31
-        $this->routeRequest('admin', $request['_action'], $request);
30
+        check_admin_referer( $request['_action'] );
31
+        $this->routeRequest( 'admin', $request['_action'], $request );
32 32
     }
33 33
 
34 34
     /**
@@ -37,9 +37,9 @@  discard block
 block discarded – undo
37 37
     public function routeAjaxRequest()
38 38
     {
39 39
         $request = $this->getRequest();
40
-        $this->checkAjaxRequest($request);
41
-        $this->checkAjaxNonce($request);
42
-        $this->routeRequest('ajax', $request['_action'], $request);
40
+        $this->checkAjaxRequest( $request );
41
+        $this->checkAjaxNonce( $request );
42
+        $this->routeRequest( 'ajax', $request['_action'], $request );
43 43
         wp_die();
44 44
     }
45 45
 
@@ -48,45 +48,45 @@  discard block
 block discarded – undo
48 48
      */
49 49
     public function routePublicPostRequest()
50 50
     {
51
-        if (is_admin()) {
51
+        if( is_admin() ) {
52 52
             return;
53 53
         }
54 54
         $request = $this->getRequest();
55
-        if (!$this->isValidPostRequest($request)) {
55
+        if( !$this->isValidPostRequest( $request ) ) {
56 56
             return;
57 57
         }
58
-        if (!$this->isValidPublicNonce($request)) {
58
+        if( !$this->isValidPublicNonce( $request ) ) {
59 59
             return;
60 60
         }
61
-        $this->routeRequest('public', $request['_action'], $request);
61
+        $this->routeRequest( 'public', $request['_action'], $request );
62 62
     }
63 63
 
64 64
     /**
65 65
      * @return void
66 66
      */
67
-    protected function checkAjaxNonce(array $request)
67
+    protected function checkAjaxNonce( array $request )
68 68
     {
69
-        if (!is_user_logged_in() || in_array(glsr_get($request, '_action'), $this->unguardedActions)) {
69
+        if( !is_user_logged_in() || in_array( glsr_get( $request, '_action' ), $this->unguardedActions ) ) {
70 70
             return;
71 71
         }
72
-        if (!isset($request['_nonce'])) {
73
-            $this->sendAjaxError('request is missing a nonce', $request);
72
+        if( !isset($request['_nonce']) ) {
73
+            $this->sendAjaxError( 'request is missing a nonce', $request );
74 74
         }
75
-        if (!wp_verify_nonce($request['_nonce'], $request['_action'])) {
76
-            $this->sendAjaxError('request failed the nonce check', $request, 403);
75
+        if( !wp_verify_nonce( $request['_nonce'], $request['_action'] ) ) {
76
+            $this->sendAjaxError( 'request failed the nonce check', $request, 403 );
77 77
         }
78 78
     }
79 79
 
80 80
     /**
81 81
      * @return void
82 82
      */
83
-    protected function checkAjaxRequest(array $request)
83
+    protected function checkAjaxRequest( array $request )
84 84
     {
85
-        if (!isset($request['_action'])) {
86
-            $this->sendAjaxError('request must include an action', $request);
85
+        if( !isset($request['_action']) ) {
86
+            $this->sendAjaxError( 'request must include an action', $request );
87 87
         }
88
-        if (empty($request['_ajax_request'])) {
89
-            $this->sendAjaxError('request is invalid', $request);
88
+        if( empty($request['_ajax_request']) ) {
89
+            $this->sendAjaxError( 'request is invalid', $request );
90 90
         }
91 91
     }
92 92
 
@@ -97,12 +97,12 @@  discard block
 block discarded – undo
97 97
      */
98 98
     protected function getRequest()
99 99
     {
100
-        $request = glsr(Helper::class)->filterInputArray(Application::ID);
101
-        if (glsr(Helper::class)->filterInput('action') == Application::PREFIX.'action') {
100
+        $request = glsr( Helper::class )->filterInputArray( Application::ID );
101
+        if( glsr( Helper::class )->filterInput( 'action' ) == Application::PREFIX.'action' ) {
102 102
             $request['_ajax_request'] = true;
103 103
         }
104
-        if ('submit-review' == glsr(Helper::class)->filterInput('_action', $request)) {
105
-            $request['_recaptcha-token'] = glsr(Helper::class)->filterInput('g-recaptcha-response');
104
+        if( 'submit-review' == glsr( Helper::class )->filterInput( '_action', $request ) ) {
105
+            $request['_recaptcha-token'] = glsr( Helper::class )->filterInput( 'g-recaptcha-response' );
106 106
         }
107 107
         return $request;
108 108
     }
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
     /**
111 111
      * @return bool
112 112
      */
113
-    protected function isValidPostRequest(array $request = [])
113
+    protected function isValidPostRequest( array $request = [] )
114 114
     {
115 115
         return !empty($request['_action']) && empty($request['_ajax_request']);
116 116
     }
@@ -118,10 +118,10 @@  discard block
 block discarded – undo
118 118
     /**
119 119
      * @return bool
120 120
      */
121
-    protected function isValidPublicNonce(array $request)
121
+    protected function isValidPublicNonce( array $request )
122 122
     {
123
-        if (is_user_logged_in() && !wp_verify_nonce($request['_nonce'], $request['_action'])) {
124
-            glsr_log()->error('nonce check failed for public request')->debug($request);
123
+        if( is_user_logged_in() && !wp_verify_nonce( $request['_nonce'], $request['_action'] ) ) {
124
+            glsr_log()->error( 'nonce check failed for public request' )->debug( $request );
125 125
             return false;
126 126
         }
127 127
         return true;
@@ -132,19 +132,19 @@  discard block
 block discarded – undo
132 132
      * @param string $action
133 133
      * @return void
134 134
      */
135
-    protected function routeRequest($type, $action, array $request = [])
135
+    protected function routeRequest( $type, $action, array $request = [] )
136 136
     {
137 137
         $actionHook = 'site-reviews/route/'.$type.'/request';
138
-        $controller = glsr(glsr(Helper::class)->buildClassName($type.'-controller', 'Controllers'));
139
-        $method = glsr(Helper::class)->buildMethodName($action, 'router');
140
-        $request = apply_filters('site-reviews/route/request', $request, $action, $type);
141
-        do_action($actionHook, $action, $request);
142
-        if (is_callable([$controller, $method])) {
143
-            call_user_func([$controller, $method], $request);
138
+        $controller = glsr( glsr( Helper::class )->buildClassName( $type.'-controller', 'Controllers' ) );
139
+        $method = glsr( Helper::class )->buildMethodName( $action, 'router' );
140
+        $request = apply_filters( 'site-reviews/route/request', $request, $action, $type );
141
+        do_action( $actionHook, $action, $request );
142
+        if( is_callable( [$controller, $method] ) ) {
143
+            call_user_func( [$controller, $method], $request );
144 144
             return;
145 145
         }
146
-        if (0 === did_action($actionHook)) {
147
-            glsr_log('Unknown '.$type.' router request: '.$action);
146
+        if( 0 === did_action( $actionHook ) ) {
147
+            glsr_log( 'Unknown '.$type.' router request: '.$action );
148 148
         }
149 149
     }
150 150
 
@@ -153,14 +153,14 @@  discard block
 block discarded – undo
153 153
      * @param int $statusCode
154 154
      * @return void
155 155
      */
156
-    protected function sendAjaxError($error, array $request, $statusCode = 400)
156
+    protected function sendAjaxError( $error, array $request, $statusCode = 400 )
157 157
     {
158
-        glsr_log()->error($error)->debug($request);
159
-        glsr(Notice::class)->addError(__('There was an error (try reloading the page).', 'site-reviews').' <code>'.$error.'</code>');
160
-        wp_send_json_error([
161
-            'message' => __('The form could not be submitted. Please notify the site administrator.', 'site-reviews'),
162
-            'notices' => glsr(Notice::class)->get(),
158
+        glsr_log()->error( $error )->debug( $request );
159
+        glsr( Notice::class )->addError( __( 'There was an error (try reloading the page).', 'site-reviews' ).' <code>'.$error.'</code>' );
160
+        wp_send_json_error( [
161
+            'message' => __( 'The form could not be submitted. Please notify the site administrator.', 'site-reviews' ),
162
+            'notices' => glsr( Notice::class )->get(),
163 163
             'error' => $error,
164
-        ]);
164
+        ] );
165 165
     }
166 166
 }
Please login to merge, or discard this patch.
plugin/Modules/Upgrader/Upgrade_4_0_0.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
         $this->migrateSettings();
15 15
         $this->protectMetaKeys();
16 16
         $this->deleteSessions();
17
-        delete_transient(Application::ID.'_cloudflare_ips');
17
+        delete_transient( Application::ID.'_cloudflare_ips' );
18 18
     }
19 19
 
20 20
     /**
@@ -23,11 +23,11 @@  discard block
 block discarded – undo
23 23
     public function deleteSessions()
24 24
     {
25 25
         global $wpdb;
26
-        $wpdb->query("
26
+        $wpdb->query( "
27 27
             DELETE
28 28
             FROM {$wpdb->options}
29 29
             WHERE option_name LIKE '_glsr_session%'
30
-        ");
30
+        " );
31 31
     }
32 32
 
33 33
     /**
@@ -35,11 +35,11 @@  discard block
 block discarded – undo
35 35
      */
36 36
     public function migrateSettings()
37 37
     {
38
-        $settingsKey = glsr(Helper::class)->snakeCase(Application::ID.'-v3');
39
-        if ($settings = get_option($settingsKey)) {
40
-            add_option(OptionManager::databaseKey(), $settings);
38
+        $settingsKey = glsr( Helper::class )->snakeCase( Application::ID.'-v3' );
39
+        if( $settings = get_option( $settingsKey ) ) {
40
+            add_option( OptionManager::databaseKey(), $settings );
41 41
         }
42
-        glsr(OptionManager::class)->set('settings.submissions.blacklist.integration', '');
42
+        glsr( OptionManager::class )->set( 'settings.submissions.blacklist.integration', '' );
43 43
     }
44 44
 
45 45
     /**
@@ -48,15 +48,15 @@  discard block
 block discarded – undo
48 48
     public function protectMetaKeys()
49 49
     {
50 50
         global $wpdb;
51
-        $keys = array_keys(glsr(CreateReviewDefaults::class)->defaults());
52
-        $keys = implode("','", $keys);
51
+        $keys = array_keys( glsr( CreateReviewDefaults::class )->defaults() );
52
+        $keys = implode( "','", $keys );
53 53
         $postType = Application::POST_TYPE;
54
-        $wpdb->query("
54
+        $wpdb->query( "
55 55
             UPDATE {$wpdb->postmeta} pm
56 56
             INNER JOIN {$wpdb->posts} p ON p.id = pm.post_id
57 57
             SET pm.meta_key = CONCAT('_', pm.meta_key)
58 58
             WHERE pm.meta_key IN ('{$keys}')
59 59
             AND p.post_type = '{$postType}'
60
-        ");
60
+        " );
61 61
     }
62 62
 }
Please login to merge, or discard this patch.
plugin/Container.php 1 patch
Spacing   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
      */
44 44
     public static function load()
45 45
     {
46
-        if (empty(static::$instance)) {
46
+        if( empty(static::$instance) ) {
47 47
             static::$instance = new static();
48 48
         }
49 49
         return static::$instance;
@@ -53,16 +53,16 @@  discard block
 block discarded – undo
53 53
      * @param string $property
54 54
      * @return mixed
55 55
      */
56
-    public function __get($property)
56
+    public function __get( $property )
57 57
     {
58
-        if (property_exists($this, $property) && !in_array($property, static::PROTECTED_PROPERTIES)) {
58
+        if( property_exists( $this, $property ) && !in_array( $property, static::PROTECTED_PROPERTIES ) ) {
59 59
             return $this->$property;
60 60
         }
61
-        $constant = 'static::'.strtoupper($this->make(Helper::class)->snakeCase($property));
62
-        if (defined($constant)) {
63
-            return constant($constant);
61
+        $constant = 'static::'.strtoupper( $this->make( Helper::class )->snakeCase( $property ) );
62
+        if( defined( $constant ) ) {
63
+            return constant( $constant );
64 64
         }
65
-        return glsr_get($this->storage, $property, null);
65
+        return glsr_get( $this->storage, $property, null );
66 66
     }
67 67
 
68 68
     /**
@@ -70,14 +70,14 @@  discard block
 block discarded – undo
70 70
      * @param string $value
71 71
      * @return void
72 72
      */
73
-    public function __set($property, $value)
73
+    public function __set( $property, $value )
74 74
     {
75
-        if (!property_exists($this, $property) || in_array($property, static::PROTECTED_PROPERTIES)) {
75
+        if( !property_exists( $this, $property ) || in_array( $property, static::PROTECTED_PROPERTIES ) ) {
76 76
             $this->storage[$property] = $value;
77
-        } elseif (!isset($this->$property)) {
77
+        } elseif( !isset($this->$property) ) {
78 78
             $this->$property = $value;
79 79
         } else {
80
-            throw new Exception(sprintf('The "%s" property cannot be changed once set.', $property));
80
+            throw new Exception( sprintf( 'The "%s" property cannot be changed once set.', $property ) );
81 81
         }
82 82
     }
83 83
 
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
      * @param mixed $concrete
88 88
      * @return mixed
89 89
      */
90
-    public function bind($alias, $concrete)
90
+    public function bind( $alias, $concrete )
91 91
     {
92 92
         $this->services[$alias] = $concrete;
93 93
     }
@@ -97,21 +97,21 @@  discard block
 block discarded – undo
97 97
      * @param mixed $abstract
98 98
      * @return mixed
99 99
      */
100
-    public function make($abstract)
100
+    public function make( $abstract )
101 101
     {
102
-        if (!isset($this->services[$abstract])) {
103
-            $abstract = $this->addNamespace($abstract);
102
+        if( !isset($this->services[$abstract]) ) {
103
+            $abstract = $this->addNamespace( $abstract );
104 104
         }
105
-        if (isset($this->services[$abstract])) {
105
+        if( isset($this->services[$abstract]) ) {
106 106
             $abstract = $this->services[$abstract];
107 107
         }
108
-        if (is_callable($abstract)) {
109
-            return call_user_func_array($abstract, [$this]);
108
+        if( is_callable( $abstract ) ) {
109
+            return call_user_func_array( $abstract, [$this] );
110 110
         }
111
-        if (is_object($abstract)) {
111
+        if( is_object( $abstract ) ) {
112 112
             return $abstract;
113 113
         }
114
-        return $this->resolve($abstract);
114
+        return $this->resolve( $abstract );
115 115
     }
116 116
 
117 117
     /**
@@ -125,9 +125,9 @@  discard block
 block discarded – undo
125 125
     /**
126 126
      * @return mixed
127 127
      */
128
-    public function sessionGet($key, $fallback = '')
128
+    public function sessionGet( $key, $fallback = '' )
129 129
     {
130
-        $value = glsr_get($this->session, $key, $fallback);
130
+        $value = glsr_get( $this->session, $key, $fallback );
131 131
         unset($this->session[$key]);
132 132
         return $value;
133 133
     }
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
     /**
136 136
      * @return void
137 137
      */
138
-    public function sessionSet($key, $value)
138
+    public function sessionSet( $key, $value )
139 139
     {
140 140
         $this->session[$key] = $value;
141 141
     }
@@ -146,9 +146,9 @@  discard block
 block discarded – undo
146 146
      * @param callable|string|null $binding
147 147
      * @return void
148 148
      */
149
-    public function singleton($alias, $binding)
149
+    public function singleton( $alias, $binding )
150 150
     {
151
-        $this->bind($alias, $this->make($binding));
151
+        $this->bind( $alias, $this->make( $binding ) );
152 152
     }
153 153
 
154 154
     /**
@@ -156,9 +156,9 @@  discard block
 block discarded – undo
156 156
      * @param string $abstract
157 157
      * @return string
158 158
      */
159
-    protected function addNamespace($abstract)
159
+    protected function addNamespace( $abstract )
160 160
     {
161
-        if (false === strpos($abstract, __NAMESPACE__) && !class_exists($abstract)) {
161
+        if( false === strpos( $abstract, __NAMESPACE__ ) && !class_exists( $abstract ) ) {
162 162
             $abstract = __NAMESPACE__.'\\'.$abstract;
163 163
         }
164 164
         return $abstract;
@@ -170,21 +170,21 @@  discard block
 block discarded – undo
170 170
      * @return mixed
171 171
      * @throws Exception
172 172
      */
173
-    protected function resolve($concrete)
173
+    protected function resolve( $concrete )
174 174
     {
175
-        if ($concrete instanceof Closure) {
176
-            return $concrete($this);
175
+        if( $concrete instanceof Closure ) {
176
+            return $concrete( $this );
177 177
         }
178
-        $reflector = new ReflectionClass($concrete);
179
-        if (!$reflector->isInstantiable()) {
180
-            throw new Exception('Target ['.$concrete.'] is not instantiable.');
178
+        $reflector = new ReflectionClass( $concrete );
179
+        if( !$reflector->isInstantiable() ) {
180
+            throw new Exception( 'Target ['.$concrete.'] is not instantiable.' );
181 181
         }
182 182
         $constructor = $reflector->getConstructor();
183
-        if (empty($constructor)) {
183
+        if( empty($constructor) ) {
184 184
             return new $concrete();
185 185
         }
186 186
         return $reflector->newInstanceArgs(
187
-            $this->resolveDependencies($constructor->getParameters())
187
+            $this->resolveDependencies( $constructor->getParameters() )
188 188
         );
189 189
     }
190 190
 
@@ -193,12 +193,12 @@  discard block
 block discarded – undo
193 193
      * @return mixed
194 194
      * @throws Exception
195 195
      */
196
-    protected function resolveClass(ReflectionParameter $parameter)
196
+    protected function resolveClass( ReflectionParameter $parameter )
197 197
     {
198 198
         try {
199
-            return $this->make($parameter->getClass()->name);
200
-        } catch (Exception $error) {
201
-            if ($parameter->isOptional()) {
199
+            return $this->make( $parameter->getClass()->name );
200
+        } catch( Exception $error ) {
201
+            if( $parameter->isOptional() ) {
202 202
                 return $parameter->getDefaultValue();
203 203
             }
204 204
             throw $error;
@@ -209,13 +209,13 @@  discard block
 block discarded – undo
209 209
      * Resolve all of the dependencies from the ReflectionParameters.
210 210
      * @return array
211 211
      */
212
-    protected function resolveDependencies(array $dependencies)
212
+    protected function resolveDependencies( array $dependencies )
213 213
     {
214 214
         $results = [];
215
-        foreach ($dependencies as $dependency) {
216
-            $results[] = !is_null($class = $dependency->getClass())
217
-                ? $this->resolveClass($dependency)
218
-                : $this->resolveDependency($dependency);
215
+        foreach( $dependencies as $dependency ) {
216
+            $results[] = !is_null( $class = $dependency->getClass() )
217
+                ? $this->resolveClass( $dependency )
218
+                : $this->resolveDependency( $dependency );
219 219
         }
220 220
         return $results;
221 221
     }
@@ -224,9 +224,9 @@  discard block
 block discarded – undo
224 224
      * Resolve a single ReflectionParameter dependency.
225 225
      * @return array|null
226 226
      */
227
-    protected function resolveDependency(ReflectionParameter $parameter)
227
+    protected function resolveDependency( ReflectionParameter $parameter )
228 228
     {
229
-        if ($parameter->isArray() && $parameter->isDefaultValueAvailable()) {
229
+        if( $parameter->isArray() && $parameter->isDefaultValueAvailable() ) {
230 230
             return $parameter->getDefaultValue();
231 231
         }
232 232
         return null;
Please login to merge, or discard this patch.