pryley / site-reviews

plugin/Modules/Schema/BaseType.php

Spacing +45 added lines, -45 removed lines

@@ -37,18 +37,18 @@ 
      * @param string $method
      * @return static
      */
-    public function __call($method, array $arguments)
+    public function __call( $method, array $arguments )
     {
-        return $this->setProperty($method, Arr::get($arguments, 0));
+        return $this->setProperty( $method, Arr::get( $arguments, 0 ) );
     }
 
     /**
      * @param string $type
      */
-    public function __construct($type = null)
+    public function __construct( $type = null )
     {
-        $this->type = !is_string($type)
-            ? (new ReflectionClass($this))->getShortName()
+        $this->type = !is_string( $type )
+            ? (new ReflectionClass( $this ))->getShortName()
             : $type;
         $this->setAllowedProperties();
     }
@@ -64,10 +64,10 @@ 
     /**
      * @return static
      */
-    public function addProperties(array $properties)
+    public function addProperties( array $properties )
     {
-        foreach ($properties as $property => $value) {
-            $this->setProperty($property, $value);
+        foreach( $properties as $property => $value ) {
+            $this->setProperty( $property, $value );
         }
         return $this;
     }
@@ -93,9 +93,9 @@ 
      * @param mixed $default
      * @return mixed
      */
-    public function getProperty($property, $default = null)
+    public function getProperty( $property, $default = null )
     {
-        return Arr::get($this->properties, $property, $default);
+        return Arr::get( $this->properties, $property, $default );
     }
 
     /**
@@ -111,10 +111,10 @@ 
      * @param mixed $callback
      * @return static
      */
-    public function doIf($condition, $callback)
+    public function doIf( $condition, $callback )
     {
-        if ($condition) {
-            $callback($this);
+        if( $condition ) {
+            $callback( $this );
         }
         return $this;
     }
@@ -131,18 +131,18 @@ 
      * @param mixed $offset
      * @return bool
      */
-    public function offsetExists($offset)
+    public function offsetExists( $offset )
     {
-        return array_key_exists($offset, $this->properties);
+        return array_key_exists( $offset, $this->properties );
     }
 
     /**
      * @param string $offset
      * @return mixed
      */
-    public function offsetGet($offset)
+    public function offsetGet( $offset )
     {
-        return $this->getProperty($offset);
+        return $this->getProperty( $offset );
     }
 
     /**
@@ -150,16 +150,16 @@ 
      * @param mixed $value
      * @return void
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet( $offset, $value )
     {
-        $this->setProperty($offset, $value);
+        $this->setProperty( $offset, $value );
     }
 
     /**
      * @param string $offset
      * @return void
      */
-    public function offsetUnset($offset)
+    public function offsetUnset( $offset )
     {
         unset($this->properties[$offset]);
     }
@@ -169,11 +169,11 @@ 
      * @param mixed $value
      * @return static
      */
-    public function setProperty($property, $value)
+    public function setProperty( $property, $value )
     {
-        if (!in_array($property, $this->allowed)
-            && 'UnknownType' != (new ReflectionClass($this))->getShortName()) {
-            glsr_log()->warning($this->getType().' does not allow the "'.$property.'" property');
+        if( !in_array( $property, $this->allowed )
+            && 'UnknownType' != (new ReflectionClass( $this ))->getShortName() ) {
+            glsr_log()->warning( $this->getType().' does not allow the "'.$property.'" property' );
             return $this;
         }
         $this->properties[$property] = $value;
@@ -188,7 +188,7 @@ 
         return [
             '@context' => $this->getContext(),
             '@type' => $this->getType(),
-        ] + $this->serializeProperty($this->getProperties());
+        ] + $this->serializeProperty( $this->getProperties() );
     }
 
     /**
@@ -196,8 +196,8 @@ 
      */
     public function toScript()
     {
-        return sprintf('<script type="application/ld+json">%s</script>',
-            json_encode($this->toArray(), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)
+        return sprintf( '<script type="application/ld+json">%s</script>',
+            json_encode( $this->toArray(), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES )
         );
     }
 
@@ -205,20 +205,20 @@ 
      * @param array|null $parents
      * @return array
      */
-    protected function getParents($parents = null)
+    protected function getParents( $parents = null )
     {
-        if (!isset($parents)) {
+        if( !isset($parents) ) {
             $parents = $this->parents;
         }
         $newParents = $parents;
-        foreach ($parents as $parent) {
-            $parentClass = Helper::buildClassName($parent, __NAMESPACE__);
-            if (!class_exists($parentClass)) {
+        foreach( $parents as $parent ) {
+            $parentClass = Helper::buildClassName( $parent, __NAMESPACE__ );
+            if( !class_exists( $parentClass ) ) {
                 continue;
             }
-            $newParents = array_merge($newParents, $this->getParents((new $parentClass())->parents));
+            $newParents = array_merge( $newParents, $this->getParents( (new $parentClass())->parents ) );
         }
-        return array_values(array_unique($newParents));
+        return array_values( array_unique( $newParents ) );
     }
 
     /**
@@ -227,12 +227,12 @@ 
     protected function setAllowedProperties()
     {
         $parents = $this->getParents();
-        foreach ($parents as $parent) {
-            $parentClass = Helper::buildClassName($parent, __NAMESPACE__);
-            if (!class_exists($parentClass)) {
+        foreach( $parents as $parent ) {
+            $parentClass = Helper::buildClassName( $parent, __NAMESPACE__ );
+            if( !class_exists( $parentClass ) ) {
                 continue;
             }
-            $this->allowed = array_values(array_unique(array_merge((new $parentClass())->allowed, $this->allowed)));
+            $this->allowed = array_values( array_unique( array_merge( (new $parentClass())->allowed, $this->allowed ) ) );
         }
     }
 
@@ -240,19 +240,19 @@ 
      * @param mixed $property
      * @return array|string
      */
-    protected function serializeProperty($property)
+    protected function serializeProperty( $property )
     {
-        if (is_array($property)) {
-            return array_map([$this, 'serializeProperty'], $property);
+        if( is_array( $property ) ) {
+            return array_map( [$this, 'serializeProperty'], $property );
         }
-        if ($property instanceof Type) {
+        if( $property instanceof Type ) {
             $property = $property->toArray();
             unset($property['@context']);
         }
-        if ($property instanceof DateTimeInterface) {
-            $property = $property->format(DateTime::ATOM);
+        if( $property instanceof DateTimeInterface ) {
+            $property = $property->format( DateTime::ATOM );
         }
-        if (is_object($property)) {
+        if( is_object( $property ) ) {
             throw new InvalidProperty();
         }
         return $property;

plugin/Modules/Html/Settings.php

Spacing +67 added lines, -67 removed lines

@@ -20,31 +20,31 @@ 
      * @param string $id
      * @return string
      */
-    public function buildFields($id)
+    public function buildFields( $id )
     {
-        $this->settings = glsr(DefaultsManager::class)->settings();
-        $method = Helper::buildMethodName($id, 'getTemplateDataFor');
-        $data = !method_exists($this, $method)
-            ? $this->getTemplateData($id)
-            : $this->$method($id);
-        return glsr(Template::class)->build('pages/settings/'.$id, $data);
+        $this->settings = glsr( DefaultsManager::class )->settings();
+        $method = Helper::buildMethodName( $id, 'getTemplateDataFor' );
+        $data = !method_exists( $this, $method )
+            ? $this->getTemplateData( $id )
+            : $this->$method( $id );
+        return glsr( Template::class )->build( 'pages/settings/'.$id, $data );
     }
 
     /**
      * @return string
      */
-    protected function getFieldDefault(array $field)
+    protected function getFieldDefault( array $field )
     {
-        return Arr::get($field, 'default');
+        return Arr::get( $field, 'default' );
     }
 
     /**
      * @return string
      */
-    protected function getFieldNameForDependsOn($path)
+    protected function getFieldNameForDependsOn( $path )
     {
-        $fieldName = Str::convertPathToName($path, OptionManager::databaseKey());
-        return $this->isMultiDependency($path)
+        $fieldName = Str::convertPathToName( $path, OptionManager::databaseKey() );
+        return $this->isMultiDependency( $path )
             ? $fieldName.'[]'
             : $fieldName;
     }
@@ -52,25 +52,25 @@ 
     /**
      * @return array
      */
-    protected function getSettingFields($path)
+    protected function getSettingFields( $path )
     {
-        return array_filter($this->settings, function ($key) use ($path) {
-            return Str::startsWith($path, $key);
-        }, ARRAY_FILTER_USE_KEY);
+        return array_filter( $this->settings, function( $key ) use ($path) {
+            return Str::startsWith( $path, $key );
+        }, ARRAY_FILTER_USE_KEY );
     }
 
     /**
      * @return string
      */
-    protected function getSettingRows(array $fields)
+    protected function getSettingRows( array $fields )
     {
         $rows = '';
-        foreach ($fields as $name => $field) {
-            $field = wp_parse_args($field, [
+        foreach( $fields as $name => $field ) {
+            $field = wp_parse_args( $field, [
                 'is_setting' => true,
                 'name' => $name,
-            ]);
-            $rows.= new Field($this->normalize($field));
+            ] );
+            $rows .= new Field( $this->normalize( $field ) );
         }
         return $rows;
     }
@@ -79,12 +79,12 @@ 
      * @param string $id
      * @return array
      */
-    protected function getTemplateData($id)
+    protected function getTemplateData( $id )
     {
-        $fields = $this->getSettingFields($this->normalizeSettingPath($id));
+        $fields = $this->getSettingFields( $this->normalizeSettingPath( $id ) );
         return [
             'context' => [
-                'rows' => $this->getSettingRows($fields),
+                'rows' => $this->getSettingRows( $fields ),
             ],
         ];
     }
@@ -93,19 +93,19 @@ 
      * @param string $id
      * @return array
      */
-    protected function getTemplateDataForAddons($id)
+    protected function getTemplateDataForAddons( $id )
     {
-        $fields = $this->getSettingFields($this->normalizeSettingPath($id));
-        $settings = Arr::convertDotNotationArray($fields);
-        $settingKeys = array_keys($settings['settings']['addons']);
+        $fields = $this->getSettingFields( $this->normalizeSettingPath( $id ) );
+        $settings = Arr::convertDotNotationArray( $fields );
+        $settingKeys = array_keys( $settings['settings']['addons'] );
         $results = [];
-        foreach ($settingKeys as $key) {
-            $addonFields = array_filter($fields, function ($path) use ($key) {
-                return Str::startsWith('settings.addons.'.$key, $path);
-            }, ARRAY_FILTER_USE_KEY);
-            $results[$key] = $this->getSettingRows($addonFields);
+        foreach( $settingKeys as $key ) {
+            $addonFields = array_filter( $fields, function( $path ) use ($key) {
+                return Str::startsWith( 'settings.addons.'.$key, $path );
+            }, ARRAY_FILTER_USE_KEY );
+            $results[$key] = $this->getSettingRows( $addonFields );
         }
-        ksort($results);
+        ksort( $results );
         return [
             'settings' => $results,
         ];
@@ -115,13 +115,13 @@ 
      * @param string $id
      * @return array
      */
-    protected function getTemplateDataForLicenses($id)
+    protected function getTemplateDataForLicenses( $id )
     {
-        $fields = $this->getSettingFields($this->normalizeSettingPath($id));
-        ksort($fields);
+        $fields = $this->getSettingFields( $this->normalizeSettingPath( $id ) );
+        ksort( $fields );
         return [
             'context' => [
-                'rows' => $this->getSettingRows($fields),
+                'rows' => $this->getSettingRows( $fields ),
             ],
         ];
     }
@@ -131,7 +131,7 @@ 
      */
     protected function getTemplateDataForTranslations()
     {
-        $translations = glsr(Translation::class)->renderAll();
+        $translations = glsr( Translation::class )->renderAll();
         $class = empty($translations)
             ? 'glsr-hidden'
             : '';
@@ -149,16 +149,16 @@ 
      * @param string|array $expectedValue
      * @return bool
      */
-    protected function isFieldHidden($path, $expectedValue)
+    protected function isFieldHidden( $path, $expectedValue )
     {
-        $optionValue = glsr(OptionManager::class)->get(
+        $optionValue = glsr( OptionManager::class )->get(
             $path,
-            Arr::get(glsr()->defaults, $path)
+            Arr::get( glsr()->defaults, $path )
         );
-        if (is_array($expectedValue)) {
-            return is_array($optionValue)
-                ? 0 === count(array_intersect($optionValue, $expectedValue))
-                : !in_array($optionValue, $expectedValue);
+        if( is_array( $expectedValue ) ) {
+            return is_array( $optionValue )
+                ? 0 === count( array_intersect( $optionValue, $expectedValue ) )
+                : !in_array( $optionValue, $expectedValue );
         }
         return $optionValue != $expectedValue;
     }
@@ -166,9 +166,9 @@ 
     /**
      * @return bool
      */
-    protected function isMultiDependency($path)
+    protected function isMultiDependency( $path )
     {
-        if (isset($this->settings[$path])) {
+        if( isset($this->settings[$path]) ) {
             $field = $this->settings[$path];
             return ('checkbox' == $field['type'] && !empty($field['options']))
                 || !empty($field['multiple']);
@@ -179,32 +179,32 @@ 
     /**
      * @return array
      */
-    protected function normalize(array $field)
+    protected function normalize( array $field )
     {
-        $field = $this->normalizeDependsOn($field);
-        $field = $this->normalizeLabelAndLegend($field);
-        $field = $this->normalizeValue($field);
+        $field = $this->normalizeDependsOn( $field );
+        $field = $this->normalizeLabelAndLegend( $field );
+        $field = $this->normalizeValue( $field );
         return $field;
     }
 
     /**
      * @return array
      */
-    protected function normalizeDependsOn(array $field)
+    protected function normalizeDependsOn( array $field )
     {
-        if (!empty($field['depends_on']) && is_array($field['depends_on'])) {
+        if( !empty($field['depends_on']) && is_array( $field['depends_on'] ) ) {
             $isFieldHidden = false;
             $conditions = [];
-            foreach ($field['depends_on'] as $path => $value) {
+            foreach( $field['depends_on'] as $path => $value ) {
                 $conditions[] = [
-                    'name' => $this->getFieldNameForDependsOn($path),
+                    'name' => $this->getFieldNameForDependsOn( $path ),
                     'value' => $value,
                 ];
-                if ($this->isFieldHidden($path, $value)) {
+                if( $this->isFieldHidden( $path, $value ) ) {
                     $isFieldHidden = true;
                 }
             }
-            $field['data-depends'] = json_encode($conditions, JSON_HEX_APOS | JSON_HEX_QUOT);
+            $field['data-depends'] = json_encode( $conditions, JSON_HEX_APOS | JSON_HEX_QUOT );
             $field['is_hidden'] = $isFieldHidden;
         }
         return $field;
@@ -213,14 +213,14 @@ 
     /**
      * @return array
      */
-    protected function normalizeLabelAndLegend(array $field)
+    protected function normalizeLabelAndLegend( array $field )
     {
-        if (!empty($field['label'])) {
+        if( !empty($field['label']) ) {
             $field['legend'] = $field['label'];
             unset($field['label']);
         } else {
             $field['is_valid'] = false;
-            glsr_log()->warning('Setting field is missing a label')->debug($field);
+            glsr_log()->warning( 'Setting field is missing a label' )->debug( $field );
         }
         return $field;
     }
@@ -228,12 +228,12 @@ 
     /**
      * @return array
      */
-    protected function normalizeValue(array $field)
+    protected function normalizeValue( array $field )
     {
-        if (!isset($field['value'])) {
-            $field['value'] = glsr(OptionManager::class)->get(
+        if( !isset($field['value']) ) {
+            $field['value'] = glsr( OptionManager::class )->get(
                 $field['name'],
-                $this->getFieldDefault($field)
+                $this->getFieldDefault( $field )
             );
         }
         return $field;
@@ -242,8 +242,8 @@ 
     /**
      * @return string
      */
-    protected function normalizeSettingPath($path)
+    protected function normalizeSettingPath( $path )
     {
-        return Str::prefix('settings.', rtrim($path, '.'));
+        return Str::prefix( 'settings.', rtrim( $path, '.' ) );
     }
 }

plugin/Modules/Html/Fields/Field.php

Spacing +13 added lines, -13 removed lines

@@ -12,7 +12,7 @@ 
      */
     protected $builder;
 
-    public function __construct(Builder $builder)
+    public function __construct( Builder $builder )
     {
         $this->builder = $builder;
     }
@@ -22,7 +22,7 @@ 
      */
     public function build()
     {
-        glsr_log()->error('Build method is not implemented for '.get_class($this));
+        glsr_log()->error( 'Build method is not implemented for '.get_class( $this ) );
     }
 
     /**
@@ -36,14 +36,14 @@ 
     /**
      * @return array
      */
-    public static function merge(array $args)
+    public static function merge( array $args )
     {
         $merged = array_merge(
-            wp_parse_args($args, static::defaults()),
+            wp_parse_args( $args, static::defaults() ),
             static::required()
         );
-        $merged['class'] = implode(' ', static::mergedAttribute('class', ' ', $args));
-        $merged['style'] = implode(';', static::mergedAttribute('style', ';', $args));
+        $merged['class'] = implode( ' ', static::mergedAttribute( 'class', ' ', $args ) );
+        $merged['style'] = implode( ';', static::mergedAttribute( 'style', ';', $args ) );
         return $merged;
     }
 
@@ -52,13 +52,13 @@ 
      * @param string $key
      * @return array
      */
-    public static function mergedAttribute($key, $delimiter, array $args)
+    public static function mergedAttribute( $key, $delimiter, array $args )
     {
-        return array_filter(array_merge(
-            explode($delimiter, Arr::get($args, $key)),
-            explode($delimiter, Arr::get(static::defaults(), $key)),
-            explode($delimiter, Arr::get(static::required(), $key))
-        ));
+        return array_filter( array_merge(
+            explode( $delimiter, Arr::get( $args, $key ) ),
+            explode( $delimiter, Arr::get( static::defaults(), $key ) ),
+            explode( $delimiter, Arr::get( static::required(), $key ) )
+        ) );
     }
 
     /**
@@ -74,6 +74,6 @@ 
      */
     protected function mergeFieldArgs()
     {
-        $this->builder->args = static::merge($this->builder->args);
+        $this->builder->args = static::merge( $this->builder->args );
     }
 }

plugin/Modules/Html/Template.php

Spacing +26 added lines, -26 removed lines

@@ -11,17 +11,17 @@ 
      * @param string $templatePath
      * @return void|string
      */
-    public function build($templatePath, array $data = [])
+    public function build( $templatePath, array $data = [] )
     {
-        $data = $this->normalize($data);
+        $data = $this->normalize( $data );
         ob_start();
-        glsr()->render($templatePath, $data);
+        glsr()->render( $templatePath, $data );
         $template = ob_get_clean();
-        $path = Str::removePrefix('templates/', $templatePath);
-        $template = apply_filters('site-reviews/build/template/'.$path, $template, $data);
-        $template = $this->interpolate($template, $data, $path);
-        $template = apply_filters('site-reviews/rendered/template', $template, $templatePath, $data);
-        $template = apply_filters('site-reviews/rendered/template/'.$path, $template, $data);
+        $path = Str::removePrefix( 'templates/', $templatePath );
+        $template = apply_filters( 'site-reviews/build/template/'.$path, $template, $data );
+        $template = $this->interpolate( $template, $data, $path );
+        $template = apply_filters( 'site-reviews/rendered/template', $template, $templatePath, $data );
+        $template = apply_filters( 'site-reviews/rendered/template/'.$path, $template, $data );
         return $template;
     }
 
@@ -31,37 +31,37 @@ 
      * @param string $templatePath
      * @return string
      */
-    public function interpolate($template, array $data = [], $templatePath)
+    public function interpolate( $template, array $data = [], $templatePath )
     {
-        $context = $this->normalizeContext(Arr::get($data, 'context', []));
-        $context = apply_filters('site-reviews/interpolate/'.$templatePath, $context, $template, $data);
-        foreach ($context as $key => $value) {
+        $context = $this->normalizeContext( Arr::get( $data, 'context', [] ) );
+        $context = apply_filters( 'site-reviews/interpolate/'.$templatePath, $context, $template, $data );
+        foreach( $context as $key => $value ) {
             $template = strtr(
                 $template,
-                array_fill_keys(['{'.$key.'}', '{{ '.$key.' }}'], $value)
+                array_fill_keys( ['{'.$key.'}', '{{ '.$key.' }}'], $value )
             );
         }
-        return trim($template);
+        return trim( $template );
     }
 
     /**
      * @param string $templatePath
      * @return void|string
      */
-    public function render($templatePath, array $data = [])
+    public function render( $templatePath, array $data = [] )
     {
-        echo $this->build($templatePath, $data);
+        echo $this->build( $templatePath, $data );
     }
 
     /**
      * @return array
      */
-    protected function normalize(array $data)
+    protected function normalize( array $data )
     {
         $arrayKeys = ['context', 'globals'];
-        $data = wp_parse_args($data, array_fill_keys($arrayKeys, []));
-        foreach ($arrayKeys as $key) {
-            if (is_array($data[$key])) {
+        $data = wp_parse_args( $data, array_fill_keys( $arrayKeys, [] ) );
+        foreach( $arrayKeys as $key ) {
+            if( is_array( $data[$key] ) ) {
                 continue;
             }
             $data[$key] = [];
@@ -72,13 +72,13 @@ 
     /**
      * @return array
      */
-    protected function normalizeContext(array $context)
+    protected function normalizeContext( array $context )
     {
-        $context = array_filter($context, function ($value) {
-            return !is_array($value) && !is_object($value);
+        $context = array_filter( $context, function( $value ) {
+            return !is_array( $value ) && !is_object( $value );
         });
-        return array_map(function ($value) {
-            return (string) $value;
-        }, $context);
+        return array_map( function( $value ) {
+            return (string)$value;
+        }, $context );
     }
 }

plugin/Modules/Upgrader/Upgrade_3_0_0.php

Spacing +19 added lines, -19 removed lines

@@ -71,11 +71,11 @@ 
     {
         $this->newSettings = $this->getNewSettings();
         $this->oldSettings = $this->getOldSettings();
-        if (empty($this->oldSettings)) {
+        if( empty($this->oldSettings) ) {
             return;
         }
-        foreach (static::MAPPED_SETTINGS as $old => $new) {
-            if (empty($this->oldSettings[$old])) {
+        foreach( static::MAPPED_SETTINGS as $old => $new ) {
+            if( empty($this->oldSettings[$old]) ) {
                 continue;
             }
             $this->newSettings[$new] = $this->oldSettings[$old];
@@ -83,12 +83,12 @@ 
         $this->migrateNotificationSettings();
         $this->migrateRecaptchaSettings();
         $this->migrateRequiredSettings();
-        $oldSettings = Arr::convertDotNotationArray($this->oldSettings);
-        $newSettings = Arr::convertDotNotationArray($this->newSettings);
-        if (isset($oldSettings['settings']['strings']) && is_array($oldSettings['settings']['strings'])) {
+        $oldSettings = Arr::convertDotNotationArray( $this->oldSettings );
+        $newSettings = Arr::convertDotNotationArray( $this->newSettings );
+        if( isset($oldSettings['settings']['strings']) && is_array( $oldSettings['settings']['strings'] ) ) {
             $newSettings['settings']['strings'] = $oldSettings['settings']['strings'];
         }
-        glsr(OptionManager::class)->set($newSettings);
+        glsr( OptionManager::class )->set( $newSettings );
     }
 
     /**
@@ -97,8 +97,8 @@ 
     protected function getNewSettings()
     {
         return wp_parse_args(
-            Arr::flattenArray(glsr(OptionManager::class)->all()),
-            glsr(DefaultsManager::class)->defaults()
+            Arr::flattenArray( glsr( OptionManager::class )->all() ),
+            glsr( DefaultsManager::class )->defaults()
         );
     }
 
@@ -107,10 +107,10 @@ 
      */
     protected function getOldSettings()
     {
-        $defaults = array_fill_keys(array_keys(static::MAPPED_SETTINGS), '');
-        $settings = Arr::flattenArray((array) get_option('geminilabs_site_reviews-v2', []));
-        if (!empty($settings)) {
-            $settings = wp_parse_args($settings, $defaults);
+        $defaults = array_fill_keys( array_keys( static::MAPPED_SETTINGS ), '' );
+        $settings = Arr::flattenArray( (array)get_option( 'geminilabs_site_reviews-v2', [] ) );
+        if( !empty($settings) ) {
+            $settings = wp_parse_args( $settings, $defaults );
         }
         return $settings;
     }
@@ -126,8 +126,8 @@ 
             'webhook' => 'slack',
         ];
         $this->newSettings['settings.general.notifications'] = [];
-        foreach ($notifications as $old => $new) {
-            if ($this->oldSettings['settings.general.notification'] != $old) {
+        foreach( $notifications as $old => $new ) {
+            if( $this->oldSettings['settings.general.notification'] != $old ) {
                 continue;
             }
             $this->newSettings['settings.general.notifications'][] = $new;
@@ -144,11 +144,11 @@ 
             'SecretKey' => $this->oldSettings['settings.reviews-form.recaptcha.secret'],
             'SiteKey' => $this->oldSettings['settings.reviews-form.recaptcha.key'],
         ];
-        if (in_array($this->oldSettings['settings.reviews-form.recaptcha.integration'], ['custom', 'invisible-recaptcha'])) {
+        if( in_array( $this->oldSettings['settings.reviews-form.recaptcha.integration'], ['custom', 'invisible-recaptcha'] ) ) {
             $this->newSettings['settings.submissions.recaptcha.integration'] = 'all';
         }
-        if ('invisible-recaptcha' == $this->oldSettings['settings.reviews-form.recaptcha.integration']) {
-            $recaptcha = wp_parse_args((array) get_site_option('ic-settings', [], false), $recaptcha);
+        if( 'invisible-recaptcha' == $this->oldSettings['settings.reviews-form.recaptcha.integration'] ) {
+            $recaptcha = wp_parse_args( (array)get_site_option( 'ic-settings', [], false ), $recaptcha );
         }
         $this->newSettings['settings.submissions.recaptcha.key'] = $recaptcha['SiteKey'];
         $this->newSettings['settings.submissions.recaptcha.secret'] = $recaptcha['SecretKey'];
@@ -160,7 +160,7 @@ 
      */
     protected function migrateRequiredSettings()
     {
-        $this->newSettings['settings.submissions.required'] = array_filter((array) $this->oldSettings['settings.reviews-form.required']);
+        $this->newSettings['settings.submissions.required'] = array_filter( (array)$this->oldSettings['settings.reviews-form.required'] );
         $this->newSettings['settings.submissions.required'][] = 'rating';
         $this->newSettings['settings.submissions.required'][] = 'terms';
     }

plugin/Modules/Style.php

Spacing +33 added lines, -33 removed lines

@@ -34,7 +34,7 @@ 
 
     public function __construct()
     {
-        $this->style = glsr(OptionManager::class)->get('settings.general.style', 'default');
+        $this->style = glsr( OptionManager::class )->get( 'settings.general.style', 'default' );
         $this->setConfig();
     }
 
@@ -42,7 +42,7 @@ 
      * @param string $view
      * @return string
      */
-    public function filterView($view)
+    public function filterView( $view )
     {
         $styledViews = [
             'templates/form/field',
@@ -50,15 +50,15 @@ 
             'templates/form/submit-button',
             'templates/reviews-form',
         ];
-        if (!preg_match('('.implode('|', $styledViews).')', $view)) {
+        if( !preg_match( '('.implode( '|', $styledViews ).')', $view ) ) {
             return $view;
         }
-        $views = $this->generatePossibleViews($view);
-        foreach ($views as $possibleView) {
-            if (!file_exists(glsr()->file($possibleView))) {
+        $views = $this->generatePossibleViews( $view );
+        foreach( $views as $possibleView ) {
+            if( !file_exists( glsr()->file( $possibleView ) ) ) {
                 continue;
             }
-            return Str::removePrefix('views/', $possibleView);
+            return Str::removePrefix( 'views/', $possibleView );
         }
         return $view;
     }
@@ -68,7 +68,7 @@ 
      */
     public function get()
     {
-        return apply_filters('site-reviews/style', $this->style);
+        return apply_filters( 'site-reviews/style', $this->style );
     }
 
     /**
@@ -77,77 +77,77 @@ 
     public function setConfig()
     {
         $config = shortcode_atts(
-            array_fill_keys(['fields', 'pagination', 'validation'], []),
-            glsr()->config('styles/'.$this->style)
+            array_fill_keys( ['fields', 'pagination', 'validation'], [] ),
+            glsr()->config( 'styles/'.$this->style )
         );
-        $this->fields = glsr(StyleFieldsDefaults::class)->restrict($config['fields']);
-        $this->pagination = glsr(PaginationDefaults::class)->restrict($config['pagination']);
-        $this->validation = glsr(StyleValidationDefaults::class)->restrict($config['validation']);
+        $this->fields = glsr( StyleFieldsDefaults::class )->restrict( $config['fields'] );
+        $this->pagination = glsr( PaginationDefaults::class )->restrict( $config['pagination'] );
+        $this->validation = glsr( StyleValidationDefaults::class )->restrict( $config['validation'] );
     }
 
     /**
      * @return void
      */
-    public function modifyField(Builder $instance)
+    public function modifyField( Builder $instance )
     {
-        if (!$this->isPublicInstance($instance) || empty(array_filter($this->fields))) {
+        if( !$this->isPublicInstance( $instance ) || empty(array_filter( $this->fields )) ) {
             return;
         }
-        call_user_func_array([$this, 'customize'], [$instance]);
+        call_user_func_array( [$this, 'customize'], [$instance] );
     }
 
     /**
      * @return array
      */
-    public function paginationArgs(array $args)
+    public function paginationArgs( array $args )
     {
-        return wp_parse_args($args, $this->pagination);
+        return wp_parse_args( $args, $this->pagination );
     }
 
     /**
      * @return void
      */
-    protected function customize(Builder $instance)
+    protected function customize( Builder $instance )
     {
-        if (!array_key_exists($instance->tag, $this->fields)) {
+        if( !array_key_exists( $instance->tag, $this->fields ) ) {
             return;
         }
-        $args = wp_parse_args($instance->args, array_fill_keys(['class', 'type'], ''));
+        $args = wp_parse_args( $instance->args, array_fill_keys( ['class', 'type'], '' ) );
         $key = $instance->tag.'_'.$args['type'];
-        $classes = Arr::get($this->fields, $key, Arr::get($this->fields, $instance->tag));
-        $instance->args['class'] = trim($args['class'].' '.$classes);
-        do_action_ref_array('site-reviews/customize/'.$this->style, [$instance]);
+        $classes = Arr::get( $this->fields, $key, Arr::get( $this->fields, $instance->tag ) );
+        $instance->args['class'] = trim( $args['class'].' '.$classes );
+        do_action_ref_array( 'site-reviews/customize/'.$this->style, [$instance] );
     }
 
     /**
      * @param string $view
      * @return array
      */
-    protected function generatePossibleViews($view)
+    protected function generatePossibleViews( $view )
     {
-        $basename = basename($view);
-        $basepath = rtrim($view, $basename);
+        $basename = basename( $view );
+        $basepath = rtrim( $view, $basename );
         $customPath = 'views/partials/styles/'.$this->style.'/';
-        $parts = explode('_', $basename);
+        $parts = explode( '_', $basename );
         $views = [
             $customPath.$basename,
             $customPath.$parts[0],
             $view,
             $basepath.$parts[0],
         ];
-        return array_filter($views);
+        return array_filter( $views );
     }
 
     /**
      * @return bool
      */
-    protected function isPublicInstance(Builder $instance)
+    protected function isPublicInstance( Builder $instance )
     {
-        $args = wp_parse_args($instance->args, [
+        $args = wp_parse_args( $instance->args, [
             'is_public' => false,
             'is_raw' => false,
-        ]);
-        if (is_admin() || !$args['is_public'] || $args['is_raw']) {
+        ] );
+        if( is_admin() || !$args['is_public'] || $args['is_raw'] ) {
             return false;
         }
         return true;

plugin/Review.php

Spacing +40 added lines, -40 removed lines

@@ -33,27 +33,27 @@ 
     public $url;
     public $user_id;
 
-    public function __construct(WP_Post $post)
+    public function __construct( WP_Post $post )
     {
-        if (Application::POST_TYPE != $post->post_type) {
+        if( Application::POST_TYPE != $post->post_type ) {
             return;
         }
         $this->content = $post->post_content;
         $this->date = $post->post_date;
-        $this->ID = intval($post->ID);
+        $this->ID = intval( $post->ID );
         $this->status = $post->post_status;
         $this->title = $post->post_title;
-        $this->user_id = intval($post->post_author);
-        $this->setProperties($post);
-        $this->setTermIds($post);
+        $this->user_id = intval( $post->post_author );
+        $this->setProperties( $post );
+        $this->setTermIds( $post );
     }
 
     /**
      * @return mixed
      */
-    public function __get($key)
+    public function __get( $key )
     {
-        return $this->offsetGet($key);
+        return $this->offsetGet( $key );
     }
 
     /**
@@ -61,41 +61,41 @@ 
      */
     public function __toString()
     {
-        return (string) $this->build();
+        return (string)$this->build();
     }
 
     /**
      * @return ReviewHtml
      */
-    public function build(array $args = [])
+    public function build( array $args = [] )
     {
-        if (empty($this->ID)) {
-            return new ReviewHtml($this);
+        if( empty($this->ID) ) {
+            return new ReviewHtml( $this );
         }
-        $partial = glsr(SiteReviewsPartial::class);
-        $partial->args = glsr(SiteReviewsDefaults::class)->merge($args);
-        $partial->options = Arr::flattenArray(glsr(OptionManager::class)->all());
-        return $partial->buildReview($this);
+        $partial = glsr( SiteReviewsPartial::class );
+        $partial->args = glsr( SiteReviewsDefaults::class )->merge( $args );
+        $partial->options = Arr::flattenArray( glsr( OptionManager::class )->all() );
+        return $partial->buildReview( $this );
     }
 
     /**
      * @param mixed $key
      * @return bool
      */
-    public function offsetExists($key)
+    public function offsetExists( $key )
     {
-        return property_exists($this, $key) || array_key_exists($key, (array) $this->custom);
+        return property_exists( $this, $key ) || array_key_exists( $key, (array)$this->custom );
     }
 
     /**
      * @param mixed $key
      * @return mixed
      */
-    public function offsetGet($key)
+    public function offsetGet( $key )
     {
-        return property_exists($this, $key)
+        return property_exists( $this, $key )
             ? $this->$key
-            : Arr::get($this->custom, $key, null);
+            : Arr::get( $this->custom, $key, null );
     }
 
     /**
@@ -103,14 +103,14 @@ 
      * @param mixed $value
      * @return void
      */
-    public function offsetSet($key, $value)
+    public function offsetSet( $key, $value )
     {
-        if (property_exists($this, $key)) {
+        if( property_exists( $this, $key ) ) {
             $this->$key = $value;
             return;
         }
-        if (!is_array($this->custom)) {
-            $this->custom = array_filter((array) $this->custom);
+        if( !is_array( $this->custom ) ) {
+            $this->custom = array_filter( (array)$this->custom );
         }
         $this->custom[$key] = $value;
     }
@@ -119,9 +119,9 @@ 
      * @param mixed $key
      * @return void
      */
-    public function offsetUnset($key)
+    public function offsetUnset( $key )
     {
-        $this->offsetSet($key, null);
+        $this->offsetSet( $key, null );
     }
 
     /**
@@ -135,7 +135,7 @@ 
     /**
      * @return bool
      */
-    protected function isModified(array $properties)
+    protected function isModified( array $properties )
     {
         return $this->date != $properties['date']
             || $this->content != $properties['content']
@@ -145,39 +145,39 @@ 
     /**
      * @return void
      */
-    protected function setProperties(WP_Post $post)
+    protected function setProperties( WP_Post $post )
     {
         $defaults = [
-            'author' => __('Anonymous', 'site-reviews'),
+            'author' => __( 'Anonymous', 'site-reviews' ),
             'date' => '',
             'review_id' => '',
             'review_type' => 'local',
         ];
         $meta = array_filter(
-            array_map('array_shift', array_filter((array) get_post_meta($post->ID))),
+            array_map( 'array_shift', array_filter( (array)get_post_meta( $post->ID ) ) ),
             'strlen'
         );
-        $meta = array_merge($defaults, Arr::unprefixArrayKeys($meta));
-        $properties = glsr(CreateReviewDefaults::class)->restrict(array_merge($defaults, $meta));
-        $this->modified = $this->isModified($properties);
-        array_walk($properties, function ($value, $key) {
-            if (!property_exists($this, $key) || isset($this->$key)) {
+        $meta = array_merge( $defaults, Arr::unprefixArrayKeys( $meta ) );
+        $properties = glsr( CreateReviewDefaults::class )->restrict( array_merge( $defaults, $meta ) );
+        $this->modified = $this->isModified( $properties );
+        array_walk( $properties, function( $value, $key ) {
+            if( !property_exists( $this, $key ) || isset($this->$key) ) {
                 return;
             }
-            $this->$key = maybe_unserialize($value);
+            $this->$key = maybe_unserialize( $value );
         });
     }
 
     /**
      * @return void
      */
-    protected function setTermIds(WP_Post $post)
+    protected function setTermIds( WP_Post $post )
     {
         $this->term_ids = [];
-        if (!is_array($terms = get_the_terms($post, Application::TAXONOMY))) {
+        if( !is_array( $terms = get_the_terms( $post, Application::TAXONOMY ) ) ) {
             return;
         }
-        foreach ($terms as $term) {
+        foreach( $terms as $term ) {
             $this->term_ids[] = $term->term_id;
         }
     }

helpers.php

Spacing +45 added lines, -45 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-defined('WPINC') || die;
+defined( 'WPINC' ) || die;
 
 /*
  * Alternate method of using the functions without having to use `function_exists()`
@@ -8,7 +8,7 @@ 
  * @param mixed ...
  * @return mixed
  */
-add_filter('plugins_loaded', function () {
+add_filter( 'plugins_loaded', function() {
     $hooks = array(
         'glsr_calculate_ratings' => 1,
         'glsr_create_review' => 2,
@@ -21,23 +21,23 @@ 
         'glsr_log' => 3,
         'glsr_star_rating' => 2,
     );
-    foreach ($hooks as $function => $acceptedArgs) {
-        add_filter($function, function () use ($function) {
+    foreach( $hooks as $function => $acceptedArgs ) {
+        add_filter( $function, function() use ($function) {
             $args = func_get_args();
-            array_shift($args); // remove the fallback value
-            return call_user_func_array($function, $args);
-        }, 10, $acceptedArgs);
+            array_shift( $args ); // remove the fallback value
+            return call_user_func_array( $function, $args );
+        }, 10, $acceptedArgs );
     }
 });
 
 /**
  * @return mixed
  */
-function glsr($alias = null)
+function glsr( $alias = null )
 {
     $app = \GeminiLabs\SiteReviews\Application::load();
     return !empty($alias)
-        ? $app->make($alias)
+        ? $app->make( $alias )
         : $app;
 }
 
@@ -46,12 +46,12 @@ 
  * @param $column string
  * @return array
  */
-function glsr_array_column(array $array, $column)
+function glsr_array_column( array $array, $column )
 {
     $result = array();
-    foreach ($array as $subarray) {
-        $subarray = (array) $subarray;
-        if (!isset($subarray[$column])) {
+    foreach( $array as $subarray ) {
+        $subarray = (array)$subarray;
+        if( !isset($subarray[$column]) ) {
             continue;
         }
         $result[] = $subarray[$column];
@@ -64,19 +64,19 @@ 
  */
 function glsr_calculate_ratings()
 {
-    glsr('Controllers\AdminController')->routerCountReviews(false);
-    glsr_log()->notice(__('Recalculated rating counts.', 'site-reviews'));
+    glsr( 'Controllers\AdminController' )->routerCountReviews( false );
+    glsr_log()->notice( __( 'Recalculated rating counts.', 'site-reviews' ) );
 }
 
 /**
  * @return \GeminiLabs\SiteReviews\Review|false
  */
-function glsr_create_review($reviewValues = array())
+function glsr_create_review( $reviewValues = array() )
 {
     $review = new \GeminiLabs\SiteReviews\Commands\CreateReview(
-        \GeminiLabs\SiteReviews\Helpers\Arr::consolidateArray($reviewValues)
+        \GeminiLabs\SiteReviews\Helpers\Arr::consolidateArray( $reviewValues )
     );
-    return glsr('Database\ReviewManager')->create($review);
+    return glsr( 'Database\ReviewManager' )->create( $review );
 }
 
 /**
@@ -84,11 +84,11 @@ 
  */
 function glsr_current_screen()
 {
-    if (function_exists('get_current_screen')) {
+    if( function_exists( 'get_current_screen' ) ) {
         $screen = get_current_screen();
     }
     return empty($screen)
-        ? (object) array_fill_keys(['base', 'id', 'post_type'], null)
+        ? (object)array_fill_keys( ['base', 'id', 'post_type'], null )
         : $screen;
 }
 
@@ -96,15 +96,15 @@ 
  * @param mixed ...$vars
  * @return void
  */
-function glsr_debug(...$vars)
+function glsr_debug( ...$vars )
 {
-    if (1 == count($vars)) {
-        $value = htmlspecialchars(print_r($vars[0], true), ENT_QUOTES, 'UTF-8');
-        printf('<div class="glsr-debug"><pre>%s</pre></div>', $value);
+    if( 1 == count( $vars ) ) {
+        $value = htmlspecialchars( print_r( $vars[0], true ), ENT_QUOTES, 'UTF-8' );
+        printf( '<div class="glsr-debug"><pre>%s</pre></div>', $value );
     } else {
         echo '<div class="glsr-debug-group">';
-        foreach ($vars as $var) {
-            glsr_debug($var);
+        foreach( $vars as $var ) {
+            glsr_debug( $var );
         }
         echo '</div>';
     }
@@ -116,9 +116,9 @@ 
  * @param mixed $fallback
  * @return mixed
  */
-function glsr_get($array, $path = '', $fallback = '')
+function glsr_get( $array, $path = '', $fallback = '' )
 {
-    return \GeminiLabs\SiteReviews\Helpers\Arr::get($array, $path, $fallback);
+    return \GeminiLabs\SiteReviews\Helpers\Arr::get( $array, $path, $fallback );
 }
 
 /**
@@ -127,10 +127,10 @@ 
  * @param string $cast
  * @return string|array
  */
-function glsr_get_option($path = '', $fallback = '', $cast = '')
+function glsr_get_option( $path = '', $fallback = '', $cast = '' )
 {
-    return is_string($path)
-        ? glsr('Database\OptionManager')->get(\GeminiLabs\SiteReviews\Helpers\Str::prefix('settings.', $path), $fallback, $cast)
+    return is_string( $path )
+        ? glsr( 'Database\OptionManager' )->get( \GeminiLabs\SiteReviews\Helpers\Str::prefix( 'settings.', $path ), $fallback, $cast )
         : $fallback;
 }
 
@@ -139,30 +139,30 @@ 
  */
 function glsr_get_options()
 {
-    return glsr('Database\OptionManager')->get('settings');
+    return glsr( 'Database\OptionManager' )->get( 'settings' );
 }
 
 /**
  * @param \WP_Post|int $post
  * @return \GeminiLabs\SiteReviews\Review
  */
-function glsr_get_review($post)
+function glsr_get_review( $post )
 {
-    if (is_numeric($post)) {
-        $post = get_post($post);
+    if( is_numeric( $post ) ) {
+        $post = get_post( $post );
     }
-    if (!($post instanceof WP_Post)) {
-        $post = new WP_Post((object) []);
+    if( !($post instanceof WP_Post) ) {
+        $post = new WP_Post( (object)[] );
     }
-    return glsr('Database\ReviewManager')->single($post);
+    return glsr( 'Database\ReviewManager' )->single( $post );
 }
 
 /**
  * @return array
  */
-function glsr_get_reviews($args = array())
+function glsr_get_reviews( $args = array() )
 {
-    return glsr('Database\ReviewManager')->get(\GeminiLabs\SiteReviews\Helpers\Arr::consolidateArray($args));
+    return glsr( 'Database\ReviewManager' )->get( \GeminiLabs\SiteReviews\Helpers\Arr::consolidateArray( $args ) );
 }
 
 /**
@@ -171,9 +171,9 @@ 
 function glsr_log()
 {
     $args = func_get_args();
-    $console = glsr('Modules\Console');
-    if ($value = \GeminiLabs\SiteReviews\Helpers\Arr::get($args, '0')) {
-        return $console->debug($value, \GeminiLabs\SiteReviews\Helpers\Arr::get($args, '1', []));
+    $console = glsr( 'Modules\Console' );
+    if( $value = \GeminiLabs\SiteReviews\Helpers\Arr::get( $args, '0' ) ) {
+        return $console->debug( $value, \GeminiLabs\SiteReviews\Helpers\Arr::get( $args, '1', [] ) );
     }
     return $console;
 }
@@ -181,7 +181,7 @@ 
 /**
  * @return string
  */
-function glsr_star_rating($rating)
+function glsr_star_rating( $rating )
 {
-    return glsr('Modules\Html\Partial')->build('star-rating', ['rating' => $rating]);
+    return glsr( 'Modules\Html\Partial' )->build( 'star-rating', ['rating' => $rating] );
 }

plugin/Modules/Email.php

Spacing +52 added lines, -52 removed lines

@@ -42,15 +42,15 @@ 
     /**
      * @return Email
      */
-    public function compose(array $email)
+    public function compose( array $email )
     {
-        $this->normalize($email);
+        $this->normalize( $email );
         $this->attachments = $this->email['attachments'];
         $this->headers = $this->buildHeaders();
         $this->message = $this->buildHtmlMessage();
         $this->subject = $this->email['subject'];
         $this->to = $this->email['to'];
-        add_action('phpmailer_init', [$this, 'buildPlainTextMessage']);
+        add_action( 'phpmailer_init', [$this, 'buildPlainTextMessage'] );
         return $this;
     }
 
@@ -58,11 +58,11 @@ 
      * @param string $format
      * @return string|null
      */
-    public function read($format = '')
+    public function read( $format = '' )
     {
-        if ('plaintext' == $format) {
-            $message = $this->stripHtmlTags($this->message);
-            return apply_filters('site-reviews/email/message', $message, 'text', $this);
+        if( 'plaintext' == $format ) {
+            $message = $this->stripHtmlTags( $this->message );
+            return apply_filters( 'site-reviews/email/message', $message, 'text', $this );
         }
         return $this->message;
     }
@@ -72,10 +72,10 @@ 
      */
     public function send()
     {
-        if (!$this->message || !$this->subject || !$this->to) {
+        if( !$this->message || !$this->subject || !$this->to ) {
             return;
         }
-        add_action('wp_mail_failed', [$this, 'logMailError']);
+        add_action( 'wp_mail_failed', [$this, 'logMailError'] );
         $sent = wp_mail(
             $this->to,
             $this->subject,
@@ -83,7 +83,7 @@ 
             $this->headers,
             $this->attachments
         );
-        remove_action('wp_mail_failed', [$this, 'logMailError']);
+        remove_action( 'wp_mail_failed', [$this, 'logMailError'] );
         $this->reset();
         return $sent;
     }
@@ -92,16 +92,16 @@ 
      * @return void
      * @action phpmailer_init
      */
-    public function buildPlainTextMessage(PHPMailer $phpmailer)
+    public function buildPlainTextMessage( PHPMailer $phpmailer )
     {
-        if (empty($this->email)) {
+        if( empty($this->email) ) {
             return;
         }
-        if ('text/plain' === $phpmailer->ContentType || !empty($phpmailer->AltBody)) {
+        if( 'text/plain' === $phpmailer->ContentType || !empty($phpmailer->AltBody) ) {
             return;
         }
-        $message = $this->stripHtmlTags($phpmailer->Body);
-        $phpmailer->AltBody = apply_filters('site-reviews/email/message', $message, 'text', $this);
+        $message = $this->stripHtmlTags( $phpmailer->Body );
+        $phpmailer->AltBody = apply_filters( 'site-reviews/email/message', $message, 'text', $this );
     }
 
     /**
@@ -112,14 +112,14 @@ 
         $allowed = [
             'bcc', 'cc', 'from', 'reply-to',
         ];
-        $headers = array_intersect_key($this->email, array_flip($allowed));
-        $headers = array_filter($headers);
-        foreach ($headers as $key => $value) {
+        $headers = array_intersect_key( $this->email, array_flip( $allowed ) );
+        $headers = array_filter( $headers );
+        foreach( $headers as $key => $value ) {
             unset($headers[$key]);
             $headers[] = $key.': '.$value;
         }
         $headers[] = 'Content-Type: text/html';
-        return apply_filters('site-reviews/email/headers', $headers, $this);
+        return apply_filters( 'site-reviews/email/headers', $headers, $this );
     }
 
     /**
@@ -127,54 +127,54 @@ 
      */
     protected function buildHtmlMessage()
     {
-        $template = trim(glsr(OptionManager::class)->get('settings.general.notification_message'));
-        if (!empty($template)) {
-            $message = glsr(Template::class)->interpolate(
+        $template = trim( glsr( OptionManager::class )->get( 'settings.general.notification_message' ) );
+        if( !empty($template) ) {
+            $message = glsr( Template::class )->interpolate(
                 $template, 
                 ['context' => $this->email['template-tags']], 
                 $this->email['template']
             );
-        } elseif ($this->email['template']) {
-            $message = glsr(Template::class)->build('templates/'.$this->email['template'], [
+        } elseif( $this->email['template'] ) {
+            $message = glsr( Template::class )->build( 'templates/'.$this->email['template'], [
                 'context' => $this->email['template-tags'],
-            ]);
+            ] );
         }
-        if (!isset($message)) {
+        if( !isset($message) ) {
             $message = $this->email['message'];
         }
         $message = $this->email['before'].$message.$this->email['after'];
-        $message = strip_shortcodes($message);
-        $message = wptexturize($message);
-        $message = wpautop($message);
-        $message = str_replace('<> ', '', $message);
-        $message = str_replace(']]>', ']]>', $message);
-        $message = glsr(Template::class)->build('partials/email/index', [
+        $message = strip_shortcodes( $message );
+        $message = wptexturize( $message );
+        $message = wpautop( $message );
+        $message = str_replace( '<> ', '', $message );
+        $message = str_replace( ']]>', ']]>', $message );
+        $message = glsr( Template::class )->build( 'partials/email/index', [
             'context' => ['message' => $message],
-        ]);
-        return apply_filters('site-reviews/email/message', stripslashes($message), 'html', $this);
+        ] );
+        return apply_filters( 'site-reviews/email/message', stripslashes( $message ), 'html', $this );
     }
 
     /**
      * @param \WP_Error $error
      * @return void
      */
-    protected function logMailError($error)
+    protected function logMailError( $error )
     {
-        glsr_log()->error('Email was not sent (wp_mail failed)')
-            ->debug($this)
-            ->debug($error);
+        glsr_log()->error( 'Email was not sent (wp_mail failed)' )
+            ->debug( $this )
+            ->debug( $error );
     }
 
     /**
      * @return void
      */
-    protected function normalize(array $email = [])
+    protected function normalize( array $email = [] )
     {
-        $email = shortcode_atts(glsr(EmailDefaults::class)->defaults(), $email);
-        if (empty($email['reply-to'])) {
+        $email = shortcode_atts( glsr( EmailDefaults::class )->defaults(), $email );
+        if( empty($email['reply-to']) ) {
             $email['reply-to'] = $email['from'];
         }
-        $this->email = apply_filters('site-reviews/email/compose', $email, $this);
+        $this->email = apply_filters( 'site-reviews/email/compose', $email, $this );
     }
 
     /**
@@ -193,21 +193,21 @@ 
     /**
      * @return string
      */
-    protected function stripHtmlTags($string)
+    protected function stripHtmlTags( $string )
     {
         // remove invisible elements
-        $string = preg_replace('@<(embed|head|noembed|noscript|object|script|style)[^>]*?>.*?</\\1>@siu', '', $string);
+        $string = preg_replace( '@<(embed|head|noembed|noscript|object|script|style)[^>]*?>.*?</\\1>@siu', '', $string );
         // replace certain elements with a line-break
-        $string = preg_replace('@</(div|h[1-9]|p|pre|tr)@iu', "\r\n\$0", $string);
+        $string = preg_replace( '@</(div|h[1-9]|p|pre|tr)@iu', "\r\n\$0", $string );
         // replace other elements with a space
-        $string = preg_replace('@</(td|th)@iu', ' $0', $string);
+        $string = preg_replace( '@</(td|th)@iu', ' $0', $string );
         // add a placeholder for plain-text bullets to list elements
-        $string = preg_replace('@<(li)[^>]*?>@siu', '$0-o-^-o-', $string);
+        $string = preg_replace( '@<(li)[^>]*?>@siu', '$0-o-^-o-', $string );
         // strip all remaining HTML tags
-        $string = wp_strip_all_tags($string);
-        $string = wp_specialchars_decode($string, ENT_QUOTES);
-        $string = preg_replace('/\v(?:[\v\h]+){2,}/', "\r\n\r\n", $string);
-        $string = str_replace('-o-^-o-', ' - ', $string);
-        return html_entity_decode($string, ENT_QUOTES, 'UTF-8');
+        $string = wp_strip_all_tags( $string );
+        $string = wp_specialchars_decode( $string, ENT_QUOTES );
+        $string = preg_replace( '/\v(?:[\v\h]+){2,}/', "\r\n\r\n", $string );
+        $string = str_replace( '-o-^-o-', ' - ', $string );
+        return html_entity_decode( $string, ENT_QUOTES, 'UTF-8' );
     }
 }