pryley / site-reviews

plugin/Modules/Upgrader.php

Spacing +22 added lines, -22 removed lines

@@ -19,23 +19,23 @@ 
     public function run()
     {
         $filenames = [];
-        $iterator = new DirectoryIterator(dirname(__FILE__).'/Upgrader');
-        foreach ($iterator as $fileinfo) {
-            if ($fileinfo->isFile()) {
+        $iterator = new DirectoryIterator( dirname( __FILE__ ).'/Upgrader' );
+        foreach( $iterator as $fileinfo ) {
+            if( $fileinfo->isFile() ) {
                 $filenames[] = $fileinfo->getFilename();
             }
         }
-        natsort($filenames);
+        natsort( $filenames );
         $this->currentVersion = $this->currentVersion();
-        array_walk($filenames, function ($file) {
-            $className = str_replace('.php', '', $file);
-            $upgradeFromVersion = str_replace(['Upgrade_', '_'], ['', '.'], $className);
-            $suffix = preg_replace('/[\d.]+(.+)?/', '${1}', glsr()->version); // allow alpha/beta versions
-            if (version_compare($this->currentVersion, $upgradeFromVersion.$suffix, '>=')) {
+        array_walk( $filenames, function( $file ) {
+            $className = str_replace( '.php', '', $file );
+            $upgradeFromVersion = str_replace( ['Upgrade_', '_'], ['', '.'], $className );
+            $suffix = preg_replace( '/[\d.]+(.+)?/', '${1}', glsr()->version ); // allow alpha/beta versions
+            if( version_compare( $this->currentVersion, $upgradeFromVersion.$suffix, '>=' ) ) {
                 return;
             }
-            glsr('Modules\\Upgrader\\'.$className);
-            glsr_log()->notice('Completed Upgrade for v'.$upgradeFromVersion.$suffix);
+            glsr( 'Modules\\Upgrader\\'.$className );
+            glsr_log()->notice( 'Completed Upgrade for v'.$upgradeFromVersion.$suffix );
         });
         $this->finish();
     }
@@ -45,10 +45,10 @@ 
      */
     public function finish()
     {
-        if ($this->currentVersion !== glsr()->version) {
+        if( $this->currentVersion !== glsr()->version ) {
             $this->setReviewCounts();
-            $this->updateVersionFrom($this->currentVersion);
-        } elseif (!glsr(OptionManager::class)->get('last_review_count', false)) {
+            $this->updateVersionFrom( $this->currentVersion );
+        } elseif( !glsr( OptionManager::class )->get( 'last_review_count', false ) ) {
             $this->setReviewCounts();
         }
     }
@@ -60,10 +60,10 @@ 
     {
         $fallback = '0.0.0';
         $majorVersions = [4, 3, 2];
-        foreach ($majorVersions as $majorVersion) {
-            $settings = get_option(OptionManager::databaseKey($majorVersion));
-            $version = Arr::get($settings, 'version', $fallback);
-            if (version_compare($version, $fallback, '>')) {
+        foreach( $majorVersions as $majorVersion ) {
+            $settings = get_option( OptionManager::databaseKey( $majorVersion ) );
+            $version = Arr::get( $settings, 'version', $fallback );
+            if( version_compare( $version, $fallback, '>' ) ) {
                 return $version;
             }
         }
@@ -75,16 +75,16 @@ 
      */
     protected function setReviewCounts()
     {
-        add_action('admin_init', 'glsr_calculate_ratings');
+        add_action( 'admin_init', 'glsr_calculate_ratings' );
     }
 
     /**
      * @param string $previousVersion
      * @return void
      */
-    protected function updateVersionFrom($previousVersion)
+    protected function updateVersionFrom( $previousVersion )
     {
-        glsr(OptionManager::class)->set('version', glsr()->version);
-        glsr(OptionManager::class)->set('version_upgraded_from', $previousVersion);
+        glsr( OptionManager::class )->set( 'version', glsr()->version );
+        glsr( OptionManager::class )->set( 'version_upgraded_from', $previousVersion );
     }
 }

plugin/Handlers/EnqueuePublicAssets.php

Spacing +36 added lines, -36 removed lines

@@ -26,7 +26,7 @@ 
      */
     public function enqueueAssets()
     {
-        if (apply_filters('site-reviews/assets/css', true)) {
+        if( apply_filters( 'site-reviews/assets/css', true ) ) {
             wp_enqueue_style(
                 Application::ID,
                 $this->getStylesheet(),
@@ -34,14 +34,14 @@ 
                 glsr()->version
             );
         }
-        if (apply_filters('site-reviews/assets/js', true)) {
-            $dependencies = apply_filters('site-reviews/assets/polyfill', true)
+        if( apply_filters( 'site-reviews/assets/js', true ) ) {
+            $dependencies = apply_filters( 'site-reviews/assets/polyfill', true )
                 ? [Application::ID.'/polyfill']
                 : [];
-            $dependencies = apply_filters('site-reviews/enqueue/public/dependencies', $dependencies);
+            $dependencies = apply_filters( 'site-reviews/enqueue/public/dependencies', $dependencies );
             wp_enqueue_script(
                 Application::ID,
-                glsr()->url('assets/scripts/'.Application::ID.'.js'),
+                glsr()->url( 'assets/scripts/'.Application::ID.'.js' ),
                 $dependencies,
                 glsr()->version,
                 true
@@ -54,13 +54,13 @@ 
      */
     public function enqueuePolyfillService()
     {
-        if (!apply_filters('site-reviews/assets/polyfill', true)) {
+        if( !apply_filters( 'site-reviews/assets/polyfill', true ) ) {
             return;
         }
-        wp_enqueue_script(Application::ID.'/polyfill', add_query_arg([
+        wp_enqueue_script( Application::ID.'/polyfill', add_query_arg( [
             'features' => 'Array.prototype.findIndex,Array.prototype.forEach,CustomEvent,Element.prototype.closest,Element.prototype.dataset,Event,XMLHttpRequest,MutationObserver',
             'flags' => 'gated',
-        ], 'https://polyfill.io/v3/polyfill.min.js'));
+        ], 'https://polyfill.io/v3/polyfill.min.js' ) );
     }
 
     /**
@@ -71,14 +71,14 @@ 
         // wpforms-recaptcha
         // google-recaptcha
         // nf-google-recaptcha
-        if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
+        if( !glsr( OptionManager::class )->isRecaptchaEnabled() ) {
             return;
         }
-        $language = apply_filters('site-reviews/recaptcha/language', get_locale());
-        wp_enqueue_script(Application::ID.'/google-recaptcha', add_query_arg([
+        $language = apply_filters( 'site-reviews/recaptcha/language', get_locale() );
+        wp_enqueue_script( Application::ID.'/google-recaptcha', add_query_arg( [
             'hl' => $language,
             'render' => 'explicit',
-        ], 'https://www.google.com/recaptcha/api.js'));
+        ], 'https://www.google.com/recaptcha/api.js' ) );
     }
 
     /**
@@ -89,13 +89,13 @@ 
         $variables = [
             'action' => Application::PREFIX.'action',
             'ajaxpagination' => $this->getFixedSelectorsForPagination(),
-            'ajaxurl' => admin_url('admin-ajax.php'),
+            'ajaxurl' => admin_url( 'admin-ajax.php' ),
             'nameprefix' => Application::ID,
-            'validationconfig' => glsr(Style::class)->validation,
-            'validationstrings' => glsr(ValidationStringsDefaults::class)->defaults(),
+            'validationconfig' => glsr( Style::class )->validation,
+            'validationstrings' => glsr( ValidationStringsDefaults::class )->defaults(),
         ];
-        $variables = apply_filters('site-reviews/enqueue/public/localize', $variables);
-        wp_add_inline_script(Application::ID, $this->buildInlineScript($variables), 'before');
+        $variables = apply_filters( 'site-reviews/enqueue/public/localize', $variables );
+        wp_add_inline_script( Application::ID, $this->buildInlineScript( $variables ), 'before' );
     }
 
     /**
@@ -103,35 +103,35 @@ 
      */
     public function inlineStyles()
     {
-        $inlineStylesheetPath = glsr()->path('assets/styles/inline-styles.css');
-        if (!apply_filters('site-reviews/assets/css', true)) {
+        $inlineStylesheetPath = glsr()->path( 'assets/styles/inline-styles.css' );
+        if( !apply_filters( 'site-reviews/assets/css', true ) ) {
             return;
         }
-        if (!file_exists($inlineStylesheetPath)) {
-            glsr_log()->error('Inline stylesheet is missing: '.$inlineStylesheetPath);
+        if( !file_exists( $inlineStylesheetPath ) ) {
+            glsr_log()->error( 'Inline stylesheet is missing: '.$inlineStylesheetPath );
             return;
         }
-        $inlineStylesheetValues = glsr()->config('inline-styles');
+        $inlineStylesheetValues = glsr()->config( 'inline-styles' );
         $stylesheet = str_replace(
-            array_keys($inlineStylesheetValues),
-            array_values($inlineStylesheetValues),
-            file_get_contents($inlineStylesheetPath)
+            array_keys( $inlineStylesheetValues ),
+            array_values( $inlineStylesheetValues ),
+            file_get_contents( $inlineStylesheetPath )
         );
-        wp_add_inline_style(Application::ID, $stylesheet);
+        wp_add_inline_style( Application::ID, $stylesheet );
     }
 
     /**
      * @return string
      */
-    protected function buildInlineScript(array $variables)
+    protected function buildInlineScript( array $variables )
     {
         $script = 'window.hasOwnProperty("GLSR")||(window.GLSR={});';
-        foreach ($variables as $key => $value) {
-            $script.= sprintf('GLSR.%s=%s;', $key, json_encode($value, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+        foreach( $variables as $key => $value ) {
+            $script .= sprintf( 'GLSR.%s=%s;', $key, json_encode( $value, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ) );
         }
         $pattern = '/\"([^ \-\"]+)\"(:[{\[\"])/'; // removes unnecessary quotes surrounding object keys
-        $optimizedScript = preg_replace($pattern, '$1$2', $script);
-        return apply_filters('site-reviews/enqueue/public/inline-script', $optimizedScript, $script, $variables);
+        $optimizedScript = preg_replace( $pattern, '$1$2', $script );
+        return apply_filters( 'site-reviews/enqueue/public/inline-script', $optimizedScript, $script, $variables );
     }
 
     /**
@@ -140,7 +140,7 @@ 
     protected function getFixedSelectorsForPagination()
     {
         $selectors = ['#wpadminbar', '.site-navigation-fixed'];
-        return apply_filters('site-reviews/enqueue/public/localize/ajax-pagination', $selectors);
+        return apply_filters( 'site-reviews/enqueue/public/localize/ajax-pagination', $selectors );
     }
 
     /**
@@ -148,9 +148,9 @@ 
      */
     protected function getStylesheet()
     {
-        $currentStyle = glsr(Style::class)->style;
-        return file_exists(glsr()->path('assets/styles/custom/'.$currentStyle.'.css'))
-            ? glsr()->url('assets/styles/custom/'.$currentStyle.'.css')
-            : glsr()->url('assets/styles/'.Application::ID.'.css');
+        $currentStyle = glsr( Style::class )->style;
+        return file_exists( glsr()->path( 'assets/styles/custom/'.$currentStyle.'.css' ) )
+            ? glsr()->url( 'assets/styles/custom/'.$currentStyle.'.css' )
+            : glsr()->url( 'assets/styles/'.Application::ID.'.css' );
     }
 }