eventespresso / event-espresso-core

core/services/request/middleware/RecommendedVersions.php

Spacing +5 added lines, -5 removed lines

@@ -32,18 +32,18 @@ 
         $this->request = $request;
         $this->response = $response;
         // check required WP version
-        if (! $this->minimumWordPressVersionRequired()) {
+        if ( ! $this->minimumWordPressVersionRequired()) {
             $this->request->unSetRequestParam('activate', true);
             add_action('admin_notices', array($this, 'minimumWpVersionError'), 1);
             $this->response->terminateRequest();
             $this->response->deactivatePlugin();
         }
         // check recommended PHP version
-        if (! $this->minimumPhpVersionRecommended()) {
+        if ( ! $this->minimumPhpVersionRecommended()) {
             $this->displayMinimumRecommendedPhpVersionNotice();
         }
         // upcoming required version
-        if (! $this->upcomingRequiredPhpVersion()) {
+        if ( ! $this->upcomingRequiredPhpVersion()) {
             $this->displayUpcomingRequiredVersion();
         }
         $this->response = $this->processRequestStack($this->request, $this->response);
@@ -142,7 +142,7 @@ 
     {
         if ($this->request->isAdmin()) {
             new PersistentAdminNotice(
-                'php_version_' . str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED) . '_recommended',
+                'php_version_'.str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED).'_recommended',
                 sprintf(
                     esc_html__(
                         'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
@@ -180,7 +180,7 @@ 
             && apply_filters('FHEE__EE_Recommended_Versions__displayUpcomingRequiredVersion', true, $this->request)
             && current_user_can('update_plugins')
         ) {
-            add_action('admin_notices', function () {
+            add_action('admin_notices', function() {
                 echo '<div class="notice event-espresso-admin-notice notice-warning"><p>'
                      . sprintf(
                          esc_html__(

Indentation +173 added lines, -173 removed lines

@@ -18,183 +18,183 @@
  */
 class RecommendedVersions extends Middleware
 {
-    /**
-     * converts a Request to a Response
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     * @throws InvalidDataTypeException
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response)
-    {
-        $this->request = $request;
-        $this->response = $response;
-        // check required WP version
-        if (! $this->minimumWordPressVersionRequired()) {
-            $this->request->unSetRequestParam('activate', true);
-            add_action('admin_notices', array($this, 'minimumWpVersionError'), 1);
-            $this->response->terminateRequest();
-            $this->response->deactivatePlugin();
-        }
-        // check recommended PHP version
-        if (! $this->minimumPhpVersionRecommended()) {
-            $this->displayMinimumRecommendedPhpVersionNotice();
-        }
-        // upcoming required version
-        if (! $this->upcomingRequiredPhpVersion()) {
-            $this->displayUpcomingRequiredVersion();
-        }
-        $this->response = $this->processRequestStack($this->request, $this->response);
-        return $this->response;
-    }
-
-
-    /**
-     * Helper method to assess installed wp version against given values.
-     * By default this compares the required minimum version of WP for EE against the installed version of WP
-     * Note, $wp_version is the first parameter sent into the PHP version_compare function (what is being checked
-     * against) so consider that when sending in your values.
-     *
-     * @param string $version_to_check
-     * @param string $operator
-     * @return bool
-     */
-    public static function compareWordPressVersion($version_to_check = EE_MIN_WP_VER_REQUIRED, $operator = '>=')
-    {
-        global $wp_version;
-        return version_compare(
-            // first account for wp_version being pre-release
-            // (like RC, beta etc) which are usually in the format like 4.7-RC3-39519
-            strpos($wp_version, '-') > 0
-                ? substr($wp_version, 0, strpos($wp_version, '-'))
-                : $wp_version,
-            $version_to_check,
-            $operator
-        );
-    }
-
-
-    /**
-     * @return boolean
-     */
-    private function minimumWordPressVersionRequired()
-    {
-        return RecommendedVersions::compareWordPressVersion();
-    }
-
-
-    /**
-     * @param string $min_version
-     * @return boolean
-     */
-    private function checkPhpVersion($min_version = EE_MIN_PHP_VER_RECOMMENDED)
-    {
-        return version_compare(PHP_VERSION, $min_version, '>=') ? true : false;
-    }
-
-
-    /**
-     * @return boolean
-     */
-    private function minimumPhpVersionRecommended()
-    {
-        return $this->checkPhpVersion();
-    }
-
-
-    /**
-     * @return void
-     */
-    public function minimumWpVersionError()
-    {
-        global $wp_version;
-        ?>
+	/**
+	 * converts a Request to a Response
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
+	 * @throws InvalidDataTypeException
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response)
+	{
+		$this->request = $request;
+		$this->response = $response;
+		// check required WP version
+		if (! $this->minimumWordPressVersionRequired()) {
+			$this->request->unSetRequestParam('activate', true);
+			add_action('admin_notices', array($this, 'minimumWpVersionError'), 1);
+			$this->response->terminateRequest();
+			$this->response->deactivatePlugin();
+		}
+		// check recommended PHP version
+		if (! $this->minimumPhpVersionRecommended()) {
+			$this->displayMinimumRecommendedPhpVersionNotice();
+		}
+		// upcoming required version
+		if (! $this->upcomingRequiredPhpVersion()) {
+			$this->displayUpcomingRequiredVersion();
+		}
+		$this->response = $this->processRequestStack($this->request, $this->response);
+		return $this->response;
+	}
+
+
+	/**
+	 * Helper method to assess installed wp version against given values.
+	 * By default this compares the required minimum version of WP for EE against the installed version of WP
+	 * Note, $wp_version is the first parameter sent into the PHP version_compare function (what is being checked
+	 * against) so consider that when sending in your values.
+	 *
+	 * @param string $version_to_check
+	 * @param string $operator
+	 * @return bool
+	 */
+	public static function compareWordPressVersion($version_to_check = EE_MIN_WP_VER_REQUIRED, $operator = '>=')
+	{
+		global $wp_version;
+		return version_compare(
+			// first account for wp_version being pre-release
+			// (like RC, beta etc) which are usually in the format like 4.7-RC3-39519
+			strpos($wp_version, '-') > 0
+				? substr($wp_version, 0, strpos($wp_version, '-'))
+				: $wp_version,
+			$version_to_check,
+			$operator
+		);
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	private function minimumWordPressVersionRequired()
+	{
+		return RecommendedVersions::compareWordPressVersion();
+	}
+
+
+	/**
+	 * @param string $min_version
+	 * @return boolean
+	 */
+	private function checkPhpVersion($min_version = EE_MIN_PHP_VER_RECOMMENDED)
+	{
+		return version_compare(PHP_VERSION, $min_version, '>=') ? true : false;
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	private function minimumPhpVersionRecommended()
+	{
+		return $this->checkPhpVersion();
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function minimumWpVersionError()
+	{
+		global $wp_version;
+		?>
         <div class="error">
             <p>
                 <?php
-                printf(
-                    esc_html__(
-                        'We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.',
-                        'event_espresso'
-                    ),
-                    EE_MIN_WP_VER_REQUIRED,
-                    $wp_version,
-                    '<br/>',
-                    '<a href="http://codex.wordpress.org/Updating_WordPress">http://codex.wordpress.org/Updating_WordPress</a>'
-                );
-                ?>
+				printf(
+					esc_html__(
+						'We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.',
+						'event_espresso'
+					),
+					EE_MIN_WP_VER_REQUIRED,
+					$wp_version,
+					'<br/>',
+					'<a href="http://codex.wordpress.org/Updating_WordPress">http://codex.wordpress.org/Updating_WordPress</a>'
+				);
+				?>
             </p>
         </div>
         <?php
-    }
-
-
-    /**
-     *    _display_minimum_recommended_php_version_notice
-     *
-     * @access private
-     * @return void
-     * @throws InvalidDataTypeException
-     */
-    private function displayMinimumRecommendedPhpVersionNotice()
-    {
-        if ($this->request->isAdmin()) {
-            new PersistentAdminNotice(
-                'php_version_' . str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED) . '_recommended',
-                sprintf(
-                    esc_html__(
-                        'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                        'event_espresso'
-                    ),
-                    EE_MIN_PHP_VER_RECOMMENDED,
-                    PHP_VERSION,
-                    '<br/>',
-                    '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
-                )
-            );
-        }
-    }
-
-
-    /**
-     * Returns whether the provided php version number is less than the current version of php installed on the server.
-     *
-     * @param string $version_required
-     * @return bool
-     */
-    private function upcomingRequiredPhpVersion($version_required = '5.5')
-    {
-        return true;
-        // return $this->checkPhpVersion($version_required);
-    }
-
-
-    /**
-     *  Sets a notice for an upcoming required version of PHP in the next update of EE core.
-     */
-    private function displayUpcomingRequiredVersion()
-    {
-        if (
-            $this->request->isAdmin()
-            && apply_filters('FHEE__EE_Recommended_Versions__displayUpcomingRequiredVersion', true, $this->request)
-            && current_user_can('update_plugins')
-        ) {
-            add_action('admin_notices', function () {
-                echo '<div class="notice event-espresso-admin-notice notice-warning"><p>'
-                     . sprintf(
-                         esc_html__(
-                             'Please note: The next update of Event Espresso 4 will %1$srequire%2$s PHP 5.4.45 or greater.  Your web server\'s PHP version is %3$s.  You can contact your host and ask them to update your PHP version to at least PHP 5.6.  Please do not update to the new version of Event Espresso 4 until the PHP update is completed. Read about why keeping your server on the latest version of PHP is a good idea %4$shere%5$s',
-                             'event_espresso'
-                         ),
-                         '<strong>',
-                         '</strong>',
-                         PHP_VERSION,
-                         '<a href="https://wordpress.org/support/upgrade-php/">',
-                         '</a>'
-                     )
-                     . '</p></div>';
-            });
-        }
-    }
+	}
+
+
+	/**
+	 *    _display_minimum_recommended_php_version_notice
+	 *
+	 * @access private
+	 * @return void
+	 * @throws InvalidDataTypeException
+	 */
+	private function displayMinimumRecommendedPhpVersionNotice()
+	{
+		if ($this->request->isAdmin()) {
+			new PersistentAdminNotice(
+				'php_version_' . str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED) . '_recommended',
+				sprintf(
+					esc_html__(
+						'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+						'event_espresso'
+					),
+					EE_MIN_PHP_VER_RECOMMENDED,
+					PHP_VERSION,
+					'<br/>',
+					'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * Returns whether the provided php version number is less than the current version of php installed on the server.
+	 *
+	 * @param string $version_required
+	 * @return bool
+	 */
+	private function upcomingRequiredPhpVersion($version_required = '5.5')
+	{
+		return true;
+		// return $this->checkPhpVersion($version_required);
+	}
+
+
+	/**
+	 *  Sets a notice for an upcoming required version of PHP in the next update of EE core.
+	 */
+	private function displayUpcomingRequiredVersion()
+	{
+		if (
+			$this->request->isAdmin()
+			&& apply_filters('FHEE__EE_Recommended_Versions__displayUpcomingRequiredVersion', true, $this->request)
+			&& current_user_can('update_plugins')
+		) {
+			add_action('admin_notices', function () {
+				echo '<div class="notice event-espresso-admin-notice notice-warning"><p>'
+					 . sprintf(
+						 esc_html__(
+							 'Please note: The next update of Event Espresso 4 will %1$srequire%2$s PHP 5.4.45 or greater.  Your web server\'s PHP version is %3$s.  You can contact your host and ask them to update your PHP version to at least PHP 5.6.  Please do not update to the new version of Event Espresso 4 until the PHP update is completed. Read about why keeping your server on the latest version of PHP is a good idea %4$shere%5$s',
+							 'event_espresso'
+						 ),
+						 '<strong>',
+						 '</strong>',
+						 PHP_VERSION,
+						 '<a href="https://wordpress.org/support/upgrade-php/">',
+						 '</a>'
+					 )
+					 . '</p></div>';
+			});
+		}
+	}
 }

core/services/assets/AssetCollection.php

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
             /** @var Asset $asset */
             $asset = $this->current();
             if ($asset->type() === $type) {
-                $files[ $asset->handle() ] = $asset;
+                $files[$asset->handle()] = $asset;
             }
             $this->next();
         }
@@ -96,7 +96,7 @@ 
             /** @var JavascriptAsset $asset */
             $asset = $this->current();
             if ($asset->type() === Asset::TYPE_JS && $asset->hasInlineData()) {
-                $files[ $asset->handle() ] = $asset;
+                $files[$asset->handle()] = $asset;
             }
             $this->next();
         }

Indentation +188 added lines, -188 removed lines

@@ -21,192 +21,192 @@
 {
 
 
-    /**
-     * AssetCollection constructor
-     *
-     * @throws InvalidInterfaceException
-     */
-    public function __construct()
-    {
-        parent::__construct('EventEspresso\core\domain\values\assets\Asset');
-    }
-
-
-    /**
-     * @return StylesheetAsset[]
-     * @since 4.9.62.p
-     */
-    public function getStylesheetAssets()
-    {
-        return $this->getAssetsOfType(Asset::TYPE_CSS);
-    }
-
-
-    /**
-     * @return JavascriptAsset[]
-     * @since 4.9.62.p
-     */
-    public function getJavascriptAssets()
-    {
-        return $this->getAssetsOfType(Asset::TYPE_JS);
-    }
-
-
-    /**
-     * @return ManifestFile[]
-     * @since 4.9.62.p
-     */
-    public function getManifestFiles()
-    {
-        return $this->getAssetsOfType(Asset::TYPE_MANIFEST);
-    }
-
-
-    /**
-     * @param $type
-     * @return JavascriptAsset[]|StylesheetAsset[]|ManifestFile[]
-     * @since 4.9.62.p
-     */
-    protected function getAssetsOfType($type)
-    {
-        $files = array();
-        $this->rewind();
-        while ($this->valid()) {
-            /** @var Asset $asset */
-            $asset = $this->current();
-            if ($asset->type() === $type) {
-                $files[ $asset->handle() ] = $asset;
-            }
-            $this->next();
-        }
-        $this->rewind();
-        return $files;
-    }
-
-
-    /**
-     * @return JavascriptAsset[]
-     * @since 4.9.62.p
-     */
-    public function getJavascriptAssetsWithData()
-    {
-        $files = array();
-        $this->rewind();
-        while ($this->valid()) {
-            /** @var JavascriptAsset $asset */
-            $asset = $this->current();
-            if ($asset->type() === Asset::TYPE_JS && $asset->hasInlineData()) {
-                $files[ $asset->handle() ] = $asset;
-            }
-            $this->next();
-        }
-        $this->rewind();
-        return $files;
-    }
-
-
-    /**
-     * returns TRUE or FALSE
-     * depending on whether the object is within the Collection
-     * based on the supplied $identifier and type
-     *
-     * @param  mixed $identifier
-     * @param string $type
-     * @return bool
-     * @since 4.9.63.p
-     */
-    public function hasAssetOfType($identifier, $type = Asset::TYPE_JS)
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if ($this->getInfo() === $identifier && $this->current()->type() === $type) {
-                $this->rewind();
-                return true;
-            }
-            $this->next();
-        }
-        return false;
-    }
-
-
-    /**
-     * returns TRUE or FALSE
-     * depending on whether the Javascript Asset is within the Collection
-     * based on the supplied $identifier
-     *
-     * @param  mixed $identifier
-     * @return bool
-     * @since 4.9.63.p
-     */
-    public function hasJavascriptAsset($identifier)
-    {
-        return $this->hasAssetOfType($identifier, Asset::TYPE_JS);
-    }
-
-
-    /**
-     * returns TRUE or FALSE
-     * depending on whether the Stylesheet Asset is within the Collection
-     * based on the supplied $identifier
-     *
-     * @param  mixed $identifier
-     * @return bool
-     * @since 4.9.63.p
-     */
-    public function hasStylesheetAsset($identifier)
-    {
-        return $this->hasAssetOfType($identifier, Asset::TYPE_CSS);
-    }
-
-    /**
-     * returns the object from the Collection
-     * based on the supplied $identifier and type
-     *
-     * @param  mixed $identifier
-     * @param string $type
-     * @return JavascriptAsset|StylesheetAsset
-     * @since 4.9.63.p
-     */
-    public function getAssetOfType($identifier, $type = Asset::TYPE_JS)
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if ($this->getInfo() === $identifier && $this->current()->type() === $type) {
-                /** @var JavascriptAsset|StylesheetAsset $object */
-                $object = $this->current();
-                $this->rewind();
-                return $object;
-            }
-            $this->next();
-        }
-        return null;
-    }
-
-
-    /**
-     * returns the Stylesheet Asset from the Collection
-     * based on the supplied $identifier
-     *
-     * @param  mixed $identifier
-     * @return StylesheetAsset
-     * @since 4.9.63.p
-     */
-    public function getStylesheetAsset($identifier)
-    {
-        return $this->getAssetOfType($identifier, Asset::TYPE_CSS);
-    }
-
-
-    /**
-     * returns the Javascript Asset from the Collection
-     * based on the supplied $identifier
-     *
-     * @param  mixed $identifier
-     * @return JavascriptAsset
-     * @since 4.9.63.p
-     */
-    public function getJavascriptAsset($identifier)
-    {
-        return $this->getAssetOfType($identifier, Asset::TYPE_JS);
-    }
+	/**
+	 * AssetCollection constructor
+	 *
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct()
+	{
+		parent::__construct('EventEspresso\core\domain\values\assets\Asset');
+	}
+
+
+	/**
+	 * @return StylesheetAsset[]
+	 * @since 4.9.62.p
+	 */
+	public function getStylesheetAssets()
+	{
+		return $this->getAssetsOfType(Asset::TYPE_CSS);
+	}
+
+
+	/**
+	 * @return JavascriptAsset[]
+	 * @since 4.9.62.p
+	 */
+	public function getJavascriptAssets()
+	{
+		return $this->getAssetsOfType(Asset::TYPE_JS);
+	}
+
+
+	/**
+	 * @return ManifestFile[]
+	 * @since 4.9.62.p
+	 */
+	public function getManifestFiles()
+	{
+		return $this->getAssetsOfType(Asset::TYPE_MANIFEST);
+	}
+
+
+	/**
+	 * @param $type
+	 * @return JavascriptAsset[]|StylesheetAsset[]|ManifestFile[]
+	 * @since 4.9.62.p
+	 */
+	protected function getAssetsOfType($type)
+	{
+		$files = array();
+		$this->rewind();
+		while ($this->valid()) {
+			/** @var Asset $asset */
+			$asset = $this->current();
+			if ($asset->type() === $type) {
+				$files[ $asset->handle() ] = $asset;
+			}
+			$this->next();
+		}
+		$this->rewind();
+		return $files;
+	}
+
+
+	/**
+	 * @return JavascriptAsset[]
+	 * @since 4.9.62.p
+	 */
+	public function getJavascriptAssetsWithData()
+	{
+		$files = array();
+		$this->rewind();
+		while ($this->valid()) {
+			/** @var JavascriptAsset $asset */
+			$asset = $this->current();
+			if ($asset->type() === Asset::TYPE_JS && $asset->hasInlineData()) {
+				$files[ $asset->handle() ] = $asset;
+			}
+			$this->next();
+		}
+		$this->rewind();
+		return $files;
+	}
+
+
+	/**
+	 * returns TRUE or FALSE
+	 * depending on whether the object is within the Collection
+	 * based on the supplied $identifier and type
+	 *
+	 * @param  mixed $identifier
+	 * @param string $type
+	 * @return bool
+	 * @since 4.9.63.p
+	 */
+	public function hasAssetOfType($identifier, $type = Asset::TYPE_JS)
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			if ($this->getInfo() === $identifier && $this->current()->type() === $type) {
+				$this->rewind();
+				return true;
+			}
+			$this->next();
+		}
+		return false;
+	}
+
+
+	/**
+	 * returns TRUE or FALSE
+	 * depending on whether the Javascript Asset is within the Collection
+	 * based on the supplied $identifier
+	 *
+	 * @param  mixed $identifier
+	 * @return bool
+	 * @since 4.9.63.p
+	 */
+	public function hasJavascriptAsset($identifier)
+	{
+		return $this->hasAssetOfType($identifier, Asset::TYPE_JS);
+	}
+
+
+	/**
+	 * returns TRUE or FALSE
+	 * depending on whether the Stylesheet Asset is within the Collection
+	 * based on the supplied $identifier
+	 *
+	 * @param  mixed $identifier
+	 * @return bool
+	 * @since 4.9.63.p
+	 */
+	public function hasStylesheetAsset($identifier)
+	{
+		return $this->hasAssetOfType($identifier, Asset::TYPE_CSS);
+	}
+
+	/**
+	 * returns the object from the Collection
+	 * based on the supplied $identifier and type
+	 *
+	 * @param  mixed $identifier
+	 * @param string $type
+	 * @return JavascriptAsset|StylesheetAsset
+	 * @since 4.9.63.p
+	 */
+	public function getAssetOfType($identifier, $type = Asset::TYPE_JS)
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			if ($this->getInfo() === $identifier && $this->current()->type() === $type) {
+				/** @var JavascriptAsset|StylesheetAsset $object */
+				$object = $this->current();
+				$this->rewind();
+				return $object;
+			}
+			$this->next();
+		}
+		return null;
+	}
+
+
+	/**
+	 * returns the Stylesheet Asset from the Collection
+	 * based on the supplied $identifier
+	 *
+	 * @param  mixed $identifier
+	 * @return StylesheetAsset
+	 * @since 4.9.63.p
+	 */
+	public function getStylesheetAsset($identifier)
+	{
+		return $this->getAssetOfType($identifier, Asset::TYPE_CSS);
+	}
+
+
+	/**
+	 * returns the Javascript Asset from the Collection
+	 * based on the supplied $identifier
+	 *
+	 * @param  mixed $identifier
+	 * @return JavascriptAsset
+	 * @since 4.9.63.p
+	 */
+	public function getJavascriptAsset($identifier)
+	{
+		return $this->getAssetOfType($identifier, Asset::TYPE_JS);
+	}
 }

core/libraries/form_sections/strategies/display/EE_Radio_Button_Display_Strategy.strategy.php

Spacing +3 added lines, -3 removed lines

@@ -32,10 +32,10 @@ 
             $html .= $this->_attributes_string(
                 array(
                     'for' => $html_id,
-                    'id' => $html_id . '-lbl',
+                    'id' => $html_id.'-lbl',
                     'class' => apply_filters(
                         'FHEE__EE_Radio_Button_Display_Strategy__display__option_label_class',
-                        'ee-radio-label-after' . $label_size_class,
+                        'ee-radio-label-after'.$label_size_class,
                         $this,
                         $input,
                         $value
@@ -62,7 +62,7 @@ 
 
             $html .= '> ';
             $html .= $display_text;
-            $html .= EEH_HTML::nl(-1, 'radio') . '</label>';
+            $html .= EEH_HTML::nl(-1, 'radio').'</label>';
         }
         $html .= EEH_HTML::div('', '', 'clear-float');
         $html .= EEH_HTML::divx();

Indentation +54 added lines, -54 removed lines

@@ -11,61 +11,61 @@
  */
 class EE_Radio_Button_Display_Strategy extends EE_Compound_Input_Display_Strategy
 {
-    /**
-     *
-     * @throws EE_Error
-     * @return string of html to display the field
-     */
-    public function display()
-    {
-        $input = $this->get_input();
-        $input->set_label_sizes();
-        $label_size_class = $input->get_label_size_class();
-        $html = '';
-        foreach ($input->options() as $value => $display_text) {
-            $value = $input->get_normalization_strategy()->unnormalize($value);
+	/**
+	 *
+	 * @throws EE_Error
+	 * @return string of html to display the field
+	 */
+	public function display()
+	{
+		$input = $this->get_input();
+		$input->set_label_sizes();
+		$label_size_class = $input->get_label_size_class();
+		$html = '';
+		foreach ($input->options() as $value => $display_text) {
+			$value = $input->get_normalization_strategy()->unnormalize($value);
 
-            $html_id = $this->get_sub_input_id($value);
-            $html .= EEH_HTML::nl(0, 'radio');
+			$html_id = $this->get_sub_input_id($value);
+			$html .= EEH_HTML::nl(0, 'radio');
 
-            $html .= $this->_opening_tag('label');
-            $html .= $this->_attributes_string(
-                array(
-                    'for' => $html_id,
-                    'id' => $html_id . '-lbl',
-                    'class' => apply_filters(
-                        'FHEE__EE_Radio_Button_Display_Strategy__display__option_label_class',
-                        'ee-radio-label-after' . $label_size_class,
-                        $this,
-                        $input,
-                        $value
-                    )
-                )
-            );
-            $html .= '>';
-            $html .= EEH_HTML::nl(1, 'radio');
-            $html .= $this->_opening_tag('input');
-            $attributes = array(
-                'id' => $html_id,
-                'name' => $input->html_name(),
-                'class' => $input->html_class(),
-                'style' => $input->html_style(),
-                'type' => 'radio',
-                'value' => $value,
-                0 => $input->other_html_attributes(),
-                'data-question_label' => $input->html_label_id()
-            );
-            if ($input->raw_value() === $value) {
-                $attributes['checked'] = 'checked';
-            }
-            $html .= $this->_attributes_string($attributes);
+			$html .= $this->_opening_tag('label');
+			$html .= $this->_attributes_string(
+				array(
+					'for' => $html_id,
+					'id' => $html_id . '-lbl',
+					'class' => apply_filters(
+						'FHEE__EE_Radio_Button_Display_Strategy__display__option_label_class',
+						'ee-radio-label-after' . $label_size_class,
+						$this,
+						$input,
+						$value
+					)
+				)
+			);
+			$html .= '>';
+			$html .= EEH_HTML::nl(1, 'radio');
+			$html .= $this->_opening_tag('input');
+			$attributes = array(
+				'id' => $html_id,
+				'name' => $input->html_name(),
+				'class' => $input->html_class(),
+				'style' => $input->html_style(),
+				'type' => 'radio',
+				'value' => $value,
+				0 => $input->other_html_attributes(),
+				'data-question_label' => $input->html_label_id()
+			);
+			if ($input->raw_value() === $value) {
+				$attributes['checked'] = 'checked';
+			}
+			$html .= $this->_attributes_string($attributes);
 
-            $html .= '> ';
-            $html .= $display_text;
-            $html .= EEH_HTML::nl(-1, 'radio') . '</label>';
-        }
-        $html .= EEH_HTML::div('', '', 'clear-float');
-        $html .= EEH_HTML::divx();
-        return apply_filters('FHEE__EE_Radio_Button_Display_Strategy__display', $html, $this, $this->_input);
-    }
+			$html .= '>&nbsp;';
+			$html .= $display_text;
+			$html .= EEH_HTML::nl(-1, 'radio') . '</label>';
+		}
+		$html .= EEH_HTML::div('', '', 'clear-float');
+		$html .= EEH_HTML::divx();
+		return apply_filters('FHEE__EE_Radio_Button_Display_Strategy__display', $html, $this, $this->_input);
+	}
 }

core/services/session/SessionStartHandler.php

Spacing +2 added lines, -2 removed lines

@@ -99,7 +99,7 @@ 
         }
         // If not, then attempt to deal with any errors,
         // otherwise, try to hobble along without the session
-        if (! $this->handleSessionSaveHandlerErrors()) {
+        if ( ! $this->handleSessionSaveHandlerErrors()) {
             return;
         }
         // there is no record of a fatal error while trying to start the session
@@ -249,7 +249,7 @@ 
                     ),
                     '<a href="https://wordpress.org/plugins/wp-native-php-sessions/">',
                     '</a>',
-                    '<a href="' . $retry_session_url . '">'
+                    '<a href="'.$retry_session_url.'">'
                 ),
                 __FILE__,
                 __FUNCTION__,

Indentation +242 added lines, -242 removed lines

@@ -27,246 +27,246 @@
  */
 class SessionStartHandler
 {
-    const OPTION_NAME_SESSION_SAVE_HANDLER_STATUS = 'ee_session_save_handler_status';
-
-    const REQUEST_PARAM_RETRY_SESSION             = 'ee_retry_session';
-
-    const SESSION_SAVE_HANDLER_STATUS_FAILED      = 'session_save_handler_failed';
-
-    const SESSION_SAVE_HANDLER_STATUS_SUCCESS     = 'session_save_handler_success';
-
-    const SESSION_SAVE_HANDLER_STATUS_UNKNOWN     = 'session_save_handler_untested';
-
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
-
-
-    /**
-     * StartSession constructor.
-     *
-     * @param RequestInterface $request
-     */
-    public function __construct(RequestInterface $request)
-    {
-        $this->request = $request;
-    }
-
-
-    /**
-     * Check if a custom session save handler is in play
-     * and attempt to start the PHP session
-     *
-     * @since 4.9.68.p
-     */
-    public function startSession()
-    {
-        // check that session has started
-        if (session_id() === '') {
-            // starts a new session if one doesn't already exist, or re-initiates an existing one
-            if ($this->hasKnownCustomSessionSaveHandler()) {
-                $this->checkCustomSessionSaveHandler();
-            } else {
-                session_start();
-                session_write_close();
-            }
-        }
-    }
-
-
-    /**
-     * Returns `true` if the 'session.save_handler' ini setting matches a known custom handler
-     *
-     * @return bool
-     * @since 4.9.68.p
-     */
-    private function hasKnownCustomSessionSaveHandler(): bool
-    {
-        return ini_get('session.save_handler') === 'user';
-    }
-
-
-    /**
-     * Attempt to start the PHP session when a custom Session Save Handler is known to be set.
-     *
-     * @since 4.9.68.p
-     */
-    private function checkCustomSessionSaveHandler()
-    {
-        // If we've already successfully tested the session save handler
-        // on a previous request then just start the session
-        if ($this->sessionSaveHandlerIsValid()) {
-            session_start();
-            session_write_close();
-            return;
-        }
-        // If not, then attempt to deal with any errors,
-        // otherwise, try to hobble along without the session
-        if (! $this->handleSessionSaveHandlerErrors()) {
-            return;
-        }
-        // there is no record of a fatal error while trying to start the session
-        // so let's see if there's a custom session save handler. Proceed with caution
-        $this->initializeSessionSaveHandlerStatus();
-        // hold your breath, the custom session save handler might cause a fatal here...
-        session_start();
-        session_write_close();
-        // phew! we made it! the custom session handler is a-ok
-        $this->setSessionSaveHandlerStatusToValid();
-    }
-
-
-    /**
-     * retrieves the value for the 'ee_session_save_handler_status' WP option.
-     * default value = 'session_save_handler_untested'
-     *
-     * @return string
-     * @since 4.9.68.p
-     */
-    private function getSessionSaveHandlerStatus(): string
-    {
-        return get_option(
-            SessionStartHandler::OPTION_NAME_SESSION_SAVE_HANDLER_STATUS,
-            SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_UNKNOWN
-        );
-    }
-
-
-    /**
-     * Sets the 'ee_session_save_handler_status' WP option value to 'session_save_handler_failed'
-     * which can then be upgraded is everything works correctly
-     *
-     * @return void
-     * @since 4.9.68.p
-     */
-    private function initializeSessionSaveHandlerStatus(): void
-    {
-        update_option(
-            SessionStartHandler::OPTION_NAME_SESSION_SAVE_HANDLER_STATUS,
-            SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_FAILED
-        );
-    }
-
-
-    /**
-     * Sets the 'ee_session_save_handler_status' WP option value to 'session_save_handler_success'
-     *
-     * @return void
-     * @since 4.9.68.p
-     */
-    private function setSessionSaveHandlerStatusToValid(): void
-    {
-        update_option(
-            SessionStartHandler::OPTION_NAME_SESSION_SAVE_HANDLER_STATUS,
-            SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_SUCCESS
-        );
-    }
-
-
-    /**
-     * Sets the 'ee_session_save_handler_status' WP option value to 'session_save_handler_untested'
-     *
-     * @return void
-     * @since 4.9.68.p
-     */
-    private function resetSessionSaveHandlerStatus(): void
-    {
-        update_option(
-            SessionStartHandler::OPTION_NAME_SESSION_SAVE_HANDLER_STATUS,
-            SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_UNKNOWN
-        );
-    }
-
-
-    /**
-     * Returns `true` if the 'ee_session_save_handler_status' WP option value
-     * is equal to 'session_save_handler_success'
-     *
-     * @return bool
-     * @since 4.9.68.p
-     */
-    private function sessionSaveHandlerIsValid(): bool
-    {
-        return $this->getSessionSaveHandlerStatus() === SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_SUCCESS;
-    }
-
-
-    /**
-     * Returns `true` if the 'ee_session_save_handler_status' WP option value
-     * is equal to 'session_save_handler_failed'
-     *
-     * @return bool
-     * @since 4.9.68.p
-     */
-    private function sessionSaveHandlerFailed(): bool
-    {
-        return $this->getSessionSaveHandlerStatus() === SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_FAILED;
-    }
-
-
-    /**
-     * Returns `true` if no errors were detected with the session save handler,
-     * otherwise attempts to work notify the appropriate authorities
-     * with a suggestion for how to fix the issue, and returns `false`.
-     *
-     *
-     * @return bool
-     * @since 4.9.68.p
-     */
-    private function handleSessionSaveHandlerErrors(): bool
-    {
-        // Check if we had a fatal error last time while trying to start the session
-        if ($this->sessionSaveHandlerFailed()) {
-            // apparently, last time we tried using the custom session save handler there was a fatal
-            if ($this->request->requestParamIsSet(SessionStartHandler::REQUEST_PARAM_RETRY_SESSION)) {
-                $this->resetSessionSaveHandlerStatus();
-                // remove "ee_retry_session", otherwise if the problem still isn't fixed,
-                // we'll just keep getting the fatal error over and over.
-                // Better to remove it and redirect, and try on the next request
-                EEH_URL::safeRedirectAndExit(
-                    remove_query_arg(
-                        [SessionStartHandler::REQUEST_PARAM_RETRY_SESSION],
-                        EEH_URL::current_url()
-                    )
-                );
-            }
-            // so the session is broken, don't try it again,
-            // just show a message to users that can fix it
-            $this->displaySessionSaveHandlerErrorNotice();
-            return false;
-        }
-        return true;
-    }
-
-
-    /**
-     * Generates an EE_Error notice regarding the current session woes
-     * but only if the current user is an admin with permission to 'install_plugins'.
-     *
-     * @since 4.9.68.p
-     */
-    private function displaySessionSaveHandlerErrorNotice()
-    {
-        if (current_user_can('install_plugins')) {
-            $retry_session_url = add_query_arg(
-                [SessionStartHandler::REQUEST_PARAM_RETRY_SESSION => true],
-                EEH_URL::current_url()
-            );
-            EE_Error::add_error(
-                sprintf(
-                    esc_html__(
-                        'It appears there was a fatal error while starting the session, so Event Espresso is not able to process registrations normally. Some hosting companies, like Pantheon, require an extra plugin for Event Espresso to work. Please install the %1$sWordPress Native PHP Sessions plugin%2$s, then %3$sclick here to check if the problem is resolved.%2$s',
-                        'event_espresso'
-                    ),
-                    '<a href="https://wordpress.org/plugins/wp-native-php-sessions/">',
-                    '</a>',
-                    '<a href="' . $retry_session_url . '">'
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-    }
+	const OPTION_NAME_SESSION_SAVE_HANDLER_STATUS = 'ee_session_save_handler_status';
+
+	const REQUEST_PARAM_RETRY_SESSION             = 'ee_retry_session';
+
+	const SESSION_SAVE_HANDLER_STATUS_FAILED      = 'session_save_handler_failed';
+
+	const SESSION_SAVE_HANDLER_STATUS_SUCCESS     = 'session_save_handler_success';
+
+	const SESSION_SAVE_HANDLER_STATUS_UNKNOWN     = 'session_save_handler_untested';
+
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
+
+
+	/**
+	 * StartSession constructor.
+	 *
+	 * @param RequestInterface $request
+	 */
+	public function __construct(RequestInterface $request)
+	{
+		$this->request = $request;
+	}
+
+
+	/**
+	 * Check if a custom session save handler is in play
+	 * and attempt to start the PHP session
+	 *
+	 * @since 4.9.68.p
+	 */
+	public function startSession()
+	{
+		// check that session has started
+		if (session_id() === '') {
+			// starts a new session if one doesn't already exist, or re-initiates an existing one
+			if ($this->hasKnownCustomSessionSaveHandler()) {
+				$this->checkCustomSessionSaveHandler();
+			} else {
+				session_start();
+				session_write_close();
+			}
+		}
+	}
+
+
+	/**
+	 * Returns `true` if the 'session.save_handler' ini setting matches a known custom handler
+	 *
+	 * @return bool
+	 * @since 4.9.68.p
+	 */
+	private function hasKnownCustomSessionSaveHandler(): bool
+	{
+		return ini_get('session.save_handler') === 'user';
+	}
+
+
+	/**
+	 * Attempt to start the PHP session when a custom Session Save Handler is known to be set.
+	 *
+	 * @since 4.9.68.p
+	 */
+	private function checkCustomSessionSaveHandler()
+	{
+		// If we've already successfully tested the session save handler
+		// on a previous request then just start the session
+		if ($this->sessionSaveHandlerIsValid()) {
+			session_start();
+			session_write_close();
+			return;
+		}
+		// If not, then attempt to deal with any errors,
+		// otherwise, try to hobble along without the session
+		if (! $this->handleSessionSaveHandlerErrors()) {
+			return;
+		}
+		// there is no record of a fatal error while trying to start the session
+		// so let's see if there's a custom session save handler. Proceed with caution
+		$this->initializeSessionSaveHandlerStatus();
+		// hold your breath, the custom session save handler might cause a fatal here...
+		session_start();
+		session_write_close();
+		// phew! we made it! the custom session handler is a-ok
+		$this->setSessionSaveHandlerStatusToValid();
+	}
+
+
+	/**
+	 * retrieves the value for the 'ee_session_save_handler_status' WP option.
+	 * default value = 'session_save_handler_untested'
+	 *
+	 * @return string
+	 * @since 4.9.68.p
+	 */
+	private function getSessionSaveHandlerStatus(): string
+	{
+		return get_option(
+			SessionStartHandler::OPTION_NAME_SESSION_SAVE_HANDLER_STATUS,
+			SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_UNKNOWN
+		);
+	}
+
+
+	/**
+	 * Sets the 'ee_session_save_handler_status' WP option value to 'session_save_handler_failed'
+	 * which can then be upgraded is everything works correctly
+	 *
+	 * @return void
+	 * @since 4.9.68.p
+	 */
+	private function initializeSessionSaveHandlerStatus(): void
+	{
+		update_option(
+			SessionStartHandler::OPTION_NAME_SESSION_SAVE_HANDLER_STATUS,
+			SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_FAILED
+		);
+	}
+
+
+	/**
+	 * Sets the 'ee_session_save_handler_status' WP option value to 'session_save_handler_success'
+	 *
+	 * @return void
+	 * @since 4.9.68.p
+	 */
+	private function setSessionSaveHandlerStatusToValid(): void
+	{
+		update_option(
+			SessionStartHandler::OPTION_NAME_SESSION_SAVE_HANDLER_STATUS,
+			SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_SUCCESS
+		);
+	}
+
+
+	/**
+	 * Sets the 'ee_session_save_handler_status' WP option value to 'session_save_handler_untested'
+	 *
+	 * @return void
+	 * @since 4.9.68.p
+	 */
+	private function resetSessionSaveHandlerStatus(): void
+	{
+		update_option(
+			SessionStartHandler::OPTION_NAME_SESSION_SAVE_HANDLER_STATUS,
+			SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_UNKNOWN
+		);
+	}
+
+
+	/**
+	 * Returns `true` if the 'ee_session_save_handler_status' WP option value
+	 * is equal to 'session_save_handler_success'
+	 *
+	 * @return bool
+	 * @since 4.9.68.p
+	 */
+	private function sessionSaveHandlerIsValid(): bool
+	{
+		return $this->getSessionSaveHandlerStatus() === SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_SUCCESS;
+	}
+
+
+	/**
+	 * Returns `true` if the 'ee_session_save_handler_status' WP option value
+	 * is equal to 'session_save_handler_failed'
+	 *
+	 * @return bool
+	 * @since 4.9.68.p
+	 */
+	private function sessionSaveHandlerFailed(): bool
+	{
+		return $this->getSessionSaveHandlerStatus() === SessionStartHandler::SESSION_SAVE_HANDLER_STATUS_FAILED;
+	}
+
+
+	/**
+	 * Returns `true` if no errors were detected with the session save handler,
+	 * otherwise attempts to work notify the appropriate authorities
+	 * with a suggestion for how to fix the issue, and returns `false`.
+	 *
+	 *
+	 * @return bool
+	 * @since 4.9.68.p
+	 */
+	private function handleSessionSaveHandlerErrors(): bool
+	{
+		// Check if we had a fatal error last time while trying to start the session
+		if ($this->sessionSaveHandlerFailed()) {
+			// apparently, last time we tried using the custom session save handler there was a fatal
+			if ($this->request->requestParamIsSet(SessionStartHandler::REQUEST_PARAM_RETRY_SESSION)) {
+				$this->resetSessionSaveHandlerStatus();
+				// remove "ee_retry_session", otherwise if the problem still isn't fixed,
+				// we'll just keep getting the fatal error over and over.
+				// Better to remove it and redirect, and try on the next request
+				EEH_URL::safeRedirectAndExit(
+					remove_query_arg(
+						[SessionStartHandler::REQUEST_PARAM_RETRY_SESSION],
+						EEH_URL::current_url()
+					)
+				);
+			}
+			// so the session is broken, don't try it again,
+			// just show a message to users that can fix it
+			$this->displaySessionSaveHandlerErrorNotice();
+			return false;
+		}
+		return true;
+	}
+
+
+	/**
+	 * Generates an EE_Error notice regarding the current session woes
+	 * but only if the current user is an admin with permission to 'install_plugins'.
+	 *
+	 * @since 4.9.68.p
+	 */
+	private function displaySessionSaveHandlerErrorNotice()
+	{
+		if (current_user_can('install_plugins')) {
+			$retry_session_url = add_query_arg(
+				[SessionStartHandler::REQUEST_PARAM_RETRY_SESSION => true],
+				EEH_URL::current_url()
+			);
+			EE_Error::add_error(
+				sprintf(
+					esc_html__(
+						'It appears there was a fatal error while starting the session, so Event Espresso is not able to process registrations normally. Some hosting companies, like Pantheon, require an extra plugin for Event Espresso to work. Please install the %1$sWordPress Native PHP Sessions plugin%2$s, then %3$sclick here to check if the problem is resolved.%2$s',
+						'event_espresso'
+					),
+					'<a href="https://wordpress.org/plugins/wp-native-php-sessions/">',
+					'</a>',
+					'<a href="' . $retry_session_url . '">'
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+	}
 }

core/services/dependencies/ClassAlias.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
      */
     public function __construct($alias, $fqcn)
     {
-        if (! is_subclass_of($fqcn, $alias)) {
+        if ( ! is_subclass_of($fqcn, $alias)) {
             throw new InvalidAliasException($fqcn, $alias);
         }
         $this->alias = $alias;

Indentation +38 added lines, -38 removed lines

@@ -16,46 +16,46 @@
  */
 class ClassAlias
 {
-    /**
-     * @var string $alias   an interface or base class representing what object
-     *                      can be utilized by another object and/or function
-     */
-    private $alias;
+	/**
+	 * @var string $alias   an interface or base class representing what object
+	 *                      can be utilized by another object and/or function
+	 */
+	private $alias;
 
-    /**
-     * @var string $fqcn the actual class that should be substituted for the alias above
-     */
-    private $fqcn;
+	/**
+	 * @var string $fqcn the actual class that should be substituted for the alias above
+	 */
+	private $fqcn;
 
-    /**
-     * ClassAlias constructor.
-     *
-     * @param string $alias Interface specified by implementing class
-     * @param string $fqcn  Concrete class that satisfies interface
-     * @throws InvalidAliasException
-     */
-    public function __construct($alias, $fqcn)
-    {
-        if (! is_subclass_of($fqcn, $alias)) {
-            throw new InvalidAliasException($fqcn, $alias);
-        }
-        $this->alias = $alias;
-        $this->fqcn = $fqcn;
-    }
+	/**
+	 * ClassAlias constructor.
+	 *
+	 * @param string $alias Interface specified by implementing class
+	 * @param string $fqcn  Concrete class that satisfies interface
+	 * @throws InvalidAliasException
+	 */
+	public function __construct($alias, $fqcn)
+	{
+		if (! is_subclass_of($fqcn, $alias)) {
+			throw new InvalidAliasException($fqcn, $alias);
+		}
+		$this->alias = $alias;
+		$this->fqcn = $fqcn;
+	}
 
-    /**
-     * @return string
-     */
-    public function alias()
-    {
-        return $this->alias;
-    }
+	/**
+	 * @return string
+	 */
+	public function alias()
+	{
+		return $this->alias;
+	}
 
-    /**
-     * @return string
-     */
-    public function fqcn()
-    {
-        return $this->fqcn;
-    }
+	/**
+	 * @return string
+	 */
+	public function fqcn()
+	{
+		return $this->fqcn;
+	}
 }

core/services/factory/FactoryWithDependencyResolver.php

Indentation +33 added lines, -33 removed lines

@@ -18,41 +18,41 @@
  */
 abstract class FactoryWithDependencyResolver implements FactoryInterface
 {
-    /**
-     * @var DependencyResolverInterface $dependency_resolver
-     */
-    private $dependency_resolver;
+	/**
+	 * @var DependencyResolverInterface $dependency_resolver
+	 */
+	private $dependency_resolver;
 
-    /**
-     * @var LoaderInterface $loader
-     */
-    private $loader;
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	private $loader;
 
-    /**
-     * FactoryWithDependencyResolver constructor.
-     *
-     * @param DependencyResolverInterface $dependency_resolver
-     * @param LoaderInterface             $loader
-     */
-    public function __construct(DependencyResolverInterface $dependency_resolver, LoaderInterface $loader)
-    {
-        $this->dependency_resolver = $dependency_resolver;
-        $this->loader = $loader;
-    }
+	/**
+	 * FactoryWithDependencyResolver constructor.
+	 *
+	 * @param DependencyResolverInterface $dependency_resolver
+	 * @param LoaderInterface             $loader
+	 */
+	public function __construct(DependencyResolverInterface $dependency_resolver, LoaderInterface $loader)
+	{
+		$this->dependency_resolver = $dependency_resolver;
+		$this->loader = $loader;
+	}
 
-    /**
-     * @return DependencyResolverInterface
-     */
-    public function dependencyResolver()
-    {
-        return $this->dependency_resolver;
-    }
+	/**
+	 * @return DependencyResolverInterface
+	 */
+	public function dependencyResolver()
+	{
+		return $this->dependency_resolver;
+	}
 
-    /**
-     * @return LoaderInterface
-     */
-    public function loader()
-    {
-        return $this->loader;
-    }
+	/**
+	 * @return LoaderInterface
+	 */
+	public function loader()
+	{
+		return $this->loader;
+	}
 }

core/domain/services/pue/Config.php

Indentation +127 added lines, -127 removed lines

@@ -16,131 +16,131 @@
  */
 class Config
 {
-    /**
-     * @var EE_Network_Config
-     */
-    private $network_config;
-
-
-    /**
-     * @var EE_Config
-     */
-    private $ee_config;
-
-
-    public function __construct(EE_Network_Config $network_config, EE_Config $ee_config)
-    {
-        $this->network_config = $network_config;
-        $this->ee_config = $ee_config;
-    }
-
-
-    /**
-     * Get the site license key for the site.
-     */
-    public function siteLicenseKey()
-    {
-        return $this->network_config->core->site_license_key;
-    }
-
-
-    public function i18nDomain()
-    {
-        return 'event_espresso';
-    }
-
-
-    public function checkPeriod()
-    {
-        return 24;
-    }
-
-
-    public function optionKey()
-    {
-        return 'ee_site_license_key';
-    }
-
-
-    public function optionsPageSlug()
-    {
-        return 'espresso_general_settings';
-    }
-
-
-    public function hostServerUrl()
-    {
-        return defined('PUE_UPDATES_ENDPOINT')
-            ? PUE_UPDATES_ENDPOINT
-            : 'https://eventespresso.com';
-    }
-
-
-    public function pluginSlug()
-    {
-        // Note: PUE uses a simple preg_match to determine what type is currently installed based on version number.
-        //  So it's important that you use a key for the version type that is unique and not found in another key.
-        // For example:
-        // $plugin_slug['premium']['p'] = 'some-premium-slug';
-        // $plugin_slug['prerelease']['pr'] = 'some-pre-release-slug';
-        // The above would not work because "p" is found in both keys for the version type. ( i.e 1.0.p vs 1.0.pr )
-        // so doing something like:
-        // $plugin_slug['premium']['p'] = 'some-premium-slug';
-        // $plugin_slug['prerelease']['b'] = 'some-pre-release-slug';
-        // ..WOULD work!
-        return array(
-            'free'       => array('decaf' => 'event-espresso-core-decaf'),
-            'premium'    => array('p' => 'event-espresso-core-reg'),
-            'prerelease' => array('beta' => 'event-espresso-core-pr'),
-        );
-    }
-
-
-    /**
-     * Return whether the site is opted in for UXIP or not.
-     *
-     * @return bool
-     */
-    public function isOptedInForUxip()
-    {
-        return filter_var($this->ee_config->core->ee_ueip_optin, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * Return whether the site has been notified about UXIP or not.
-     *
-     * @return bool
-     */
-    public function hasNotifiedForUxip()
-    {
-        return filter_var($this->ee_config->core->ee_ueip_has_notified, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * Set the site opted in for UXIP.
-     */
-    public function setHasOptedInForUxip()
-    {
-        $this->ee_config->core->ee_ueip_optin = true;
-        $this->ee_config->update_espresso_config(false, false);
-    }
-
-
-    /**
-     * Set the site opted out for UXIP
-     */
-    public function setHasOptedOutForUxip()
-    {
-        $this->ee_config->core->ee_ueip_optin = false;
-        $this->ee_config->update_espresso_config(false, false);
-    }
-
-
-    public function setHasNotifiedAboutUxip()
-    {
-        $this->ee_config->core->ee_ueip_has_notified = true;
-        $this->ee_config->update_espresso_config(false, false);
-    }
+	/**
+	 * @var EE_Network_Config
+	 */
+	private $network_config;
+
+
+	/**
+	 * @var EE_Config
+	 */
+	private $ee_config;
+
+
+	public function __construct(EE_Network_Config $network_config, EE_Config $ee_config)
+	{
+		$this->network_config = $network_config;
+		$this->ee_config = $ee_config;
+	}
+
+
+	/**
+	 * Get the site license key for the site.
+	 */
+	public function siteLicenseKey()
+	{
+		return $this->network_config->core->site_license_key;
+	}
+
+
+	public function i18nDomain()
+	{
+		return 'event_espresso';
+	}
+
+
+	public function checkPeriod()
+	{
+		return 24;
+	}
+
+
+	public function optionKey()
+	{
+		return 'ee_site_license_key';
+	}
+
+
+	public function optionsPageSlug()
+	{
+		return 'espresso_general_settings';
+	}
+
+
+	public function hostServerUrl()
+	{
+		return defined('PUE_UPDATES_ENDPOINT')
+			? PUE_UPDATES_ENDPOINT
+			: 'https://eventespresso.com';
+	}
+
+
+	public function pluginSlug()
+	{
+		// Note: PUE uses a simple preg_match to determine what type is currently installed based on version number.
+		//  So it's important that you use a key for the version type that is unique and not found in another key.
+		// For example:
+		// $plugin_slug['premium']['p'] = 'some-premium-slug';
+		// $plugin_slug['prerelease']['pr'] = 'some-pre-release-slug';
+		// The above would not work because "p" is found in both keys for the version type. ( i.e 1.0.p vs 1.0.pr )
+		// so doing something like:
+		// $plugin_slug['premium']['p'] = 'some-premium-slug';
+		// $plugin_slug['prerelease']['b'] = 'some-pre-release-slug';
+		// ..WOULD work!
+		return array(
+			'free'       => array('decaf' => 'event-espresso-core-decaf'),
+			'premium'    => array('p' => 'event-espresso-core-reg'),
+			'prerelease' => array('beta' => 'event-espresso-core-pr'),
+		);
+	}
+
+
+	/**
+	 * Return whether the site is opted in for UXIP or not.
+	 *
+	 * @return bool
+	 */
+	public function isOptedInForUxip()
+	{
+		return filter_var($this->ee_config->core->ee_ueip_optin, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * Return whether the site has been notified about UXIP or not.
+	 *
+	 * @return bool
+	 */
+	public function hasNotifiedForUxip()
+	{
+		return filter_var($this->ee_config->core->ee_ueip_has_notified, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * Set the site opted in for UXIP.
+	 */
+	public function setHasOptedInForUxip()
+	{
+		$this->ee_config->core->ee_ueip_optin = true;
+		$this->ee_config->update_espresso_config(false, false);
+	}
+
+
+	/**
+	 * Set the site opted out for UXIP
+	 */
+	public function setHasOptedOutForUxip()
+	{
+		$this->ee_config->core->ee_ueip_optin = false;
+		$this->ee_config->update_espresso_config(false, false);
+	}
+
+
+	public function setHasNotifiedAboutUxip()
+	{
+		$this->ee_config->core->ee_ueip_has_notified = true;
+		$this->ee_config->update_espresso_config(false, false);
+	}
 }

core/entities/models/JsonModelSchema.php

Spacing +10 added lines, -10 removed lines

@@ -76,22 +76,22 @@ 
     public function getModelSchemaForFields(array $model_fields, array $schema)
     {
         foreach ($model_fields as $field => $model_field) {
-            if (! $model_field instanceof EE_Model_Field_Base) {
+            if ( ! $model_field instanceof EE_Model_Field_Base) {
                 continue;
             }
-            $schema['properties'][ $field ] = $model_field->getSchema();
+            $schema['properties'][$field] = $model_field->getSchema();
 
             // if this is a primary key field add the primary key item
             if ($model_field instanceof EE_Primary_Key_Field_Base) {
-                $schema['properties'][ $field ]['primary_key'] = true;
+                $schema['properties'][$field]['primary_key'] = true;
                 if ($model_field instanceof EE_Primary_Key_Int_Field) {
-                    $schema['properties'][ $field ]['readonly'] = true;
+                    $schema['properties'][$field]['readonly'] = true;
                 }
             }
 
             // if this is a foreign key field add the foreign key item
             if ($model_field instanceof EE_Foreign_Key_Field_Base) {
-                $schema['properties'][ $field ]['foreign_key'] = array(
+                $schema['properties'][$field]['foreign_key'] = array(
                     'description' => esc_html__(
                         'This is a foreign key the points to the given models.',
                         'event_espresso'
@@ -115,18 +115,18 @@ 
     public function getModelSchemaForRelations(array $relations_on_model, array $schema)
     {
         foreach ($relations_on_model as $model_name => $relation) {
-            if (! $relation instanceof EE_Model_Relation_Base) {
+            if ( ! $relation instanceof EE_Model_Relation_Base) {
                 continue;
             }
             $model_name_for_schema = $relation instanceof EE_Belongs_To_Relation
                 ? strtolower($model_name)
                 : EEH_Inflector::pluralize_and_lower($model_name);
-            $schema['properties'][ $model_name_for_schema ] = $relation->getSchema();
-            $schema['properties'][ $model_name_for_schema ]['relation_model'] = $model_name;
+            $schema['properties'][$model_name_for_schema] = $relation->getSchema();
+            $schema['properties'][$model_name_for_schema]['relation_model'] = $model_name;
 
             // links schema
-            $links_key = 'https://api.eventespresso.com/' . strtolower($model_name);
-            $schema['properties']['_links']['properties'][ $links_key ] = array(
+            $links_key = 'https://api.eventespresso.com/'.strtolower($model_name);
+            $schema['properties']['_links']['properties'][$links_key] = array(
                 'description' => esc_html__(
                     'Array of objects describing the link(s) for this relation resource.',
                     'event_espresso'

Indentation +235 added lines, -235 removed lines

@@ -24,256 +24,256 @@
  */
 class JsonModelSchema
 {
-    /**
-     * @var EEM_Base
-     */
-    protected $model;
+	/**
+	 * @var EEM_Base
+	 */
+	protected $model;
 
-    /**
-     * @var CalculatedModelFields
-     */
-    protected $fields_calculator;
+	/**
+	 * @var CalculatedModelFields
+	 */
+	protected $fields_calculator;
 
 
-    /**
-     * JsonModelSchema constructor.
-     *
-     * @param EEM_Base              $model
-     * @param CalculatedModelFields $fields_calculator
-     */
-    public function __construct(EEM_Base $model, CalculatedModelFields $fields_calculator)
-    {
-        $this->model = $model;
-        $this->fields_calculator = $fields_calculator;
-    }
+	/**
+	 * JsonModelSchema constructor.
+	 *
+	 * @param EEM_Base              $model
+	 * @param CalculatedModelFields $fields_calculator
+	 */
+	public function __construct(EEM_Base $model, CalculatedModelFields $fields_calculator)
+	{
+		$this->model = $model;
+		$this->fields_calculator = $fields_calculator;
+	}
 
 
-    /**
-     * Return the schema for a given model from a given model.
-     *
-     * @return array
-     */
-    public function getModelSchema()
-    {
-        return $this->getModelSchemaForRelations(
-            $this->model->relation_settings(),
-            $this->getModelSchemaForFields(
-                $this->model->field_settings(),
-                $this->getInitialSchemaStructure()
-            )
-        );
-    }
+	/**
+	 * Return the schema for a given model from a given model.
+	 *
+	 * @return array
+	 */
+	public function getModelSchema()
+	{
+		return $this->getModelSchemaForRelations(
+			$this->model->relation_settings(),
+			$this->getModelSchemaForFields(
+				$this->model->field_settings(),
+				$this->getInitialSchemaStructure()
+			)
+		);
+	}
 
 
-    /**
-     * Get the schema for a given set of model fields.
-     *
-     * @param EE_Model_Field_Base[] $model_fields
-     * @param array                  $schema
-     * @return array
-     */
-    public function getModelSchemaForFields(array $model_fields, array $schema)
-    {
-        foreach ($model_fields as $field => $model_field) {
-            if (! $model_field instanceof EE_Model_Field_Base) {
-                continue;
-            }
-            $schema['properties'][ $field ] = $model_field->getSchema();
+	/**
+	 * Get the schema for a given set of model fields.
+	 *
+	 * @param EE_Model_Field_Base[] $model_fields
+	 * @param array                  $schema
+	 * @return array
+	 */
+	public function getModelSchemaForFields(array $model_fields, array $schema)
+	{
+		foreach ($model_fields as $field => $model_field) {
+			if (! $model_field instanceof EE_Model_Field_Base) {
+				continue;
+			}
+			$schema['properties'][ $field ] = $model_field->getSchema();
 
-            // if this is a primary key field add the primary key item
-            if ($model_field instanceof EE_Primary_Key_Field_Base) {
-                $schema['properties'][ $field ]['primary_key'] = true;
-                if ($model_field instanceof EE_Primary_Key_Int_Field) {
-                    $schema['properties'][ $field ]['readonly'] = true;
-                }
-            }
+			// if this is a primary key field add the primary key item
+			if ($model_field instanceof EE_Primary_Key_Field_Base) {
+				$schema['properties'][ $field ]['primary_key'] = true;
+				if ($model_field instanceof EE_Primary_Key_Int_Field) {
+					$schema['properties'][ $field ]['readonly'] = true;
+				}
+			}
 
-            // if this is a foreign key field add the foreign key item
-            if ($model_field instanceof EE_Foreign_Key_Field_Base) {
-                $schema['properties'][ $field ]['foreign_key'] = array(
-                    'description' => esc_html__(
-                        'This is a foreign key the points to the given models.',
-                        'event_espresso'
-                    ),
-                    'type'        => 'array',
-                    'enum'        => $model_field->get_model_class_names_pointed_to(),
-                );
-            }
-        }
-        return $schema;
-    }
+			// if this is a foreign key field add the foreign key item
+			if ($model_field instanceof EE_Foreign_Key_Field_Base) {
+				$schema['properties'][ $field ]['foreign_key'] = array(
+					'description' => esc_html__(
+						'This is a foreign key the points to the given models.',
+						'event_espresso'
+					),
+					'type'        => 'array',
+					'enum'        => $model_field->get_model_class_names_pointed_to(),
+				);
+			}
+		}
+		return $schema;
+	}
 
 
-    /**
-     * Get the schema for a given set of model relations
-     *
-     * @param EE_Model_Relation_Base[] $relations_on_model
-     * @param array                    $schema
-     * @return array
-     */
-    public function getModelSchemaForRelations(array $relations_on_model, array $schema)
-    {
-        foreach ($relations_on_model as $model_name => $relation) {
-            if (! $relation instanceof EE_Model_Relation_Base) {
-                continue;
-            }
-            $model_name_for_schema = $relation instanceof EE_Belongs_To_Relation
-                ? strtolower($model_name)
-                : EEH_Inflector::pluralize_and_lower($model_name);
-            $schema['properties'][ $model_name_for_schema ] = $relation->getSchema();
-            $schema['properties'][ $model_name_for_schema ]['relation_model'] = $model_name;
+	/**
+	 * Get the schema for a given set of model relations
+	 *
+	 * @param EE_Model_Relation_Base[] $relations_on_model
+	 * @param array                    $schema
+	 * @return array
+	 */
+	public function getModelSchemaForRelations(array $relations_on_model, array $schema)
+	{
+		foreach ($relations_on_model as $model_name => $relation) {
+			if (! $relation instanceof EE_Model_Relation_Base) {
+				continue;
+			}
+			$model_name_for_schema = $relation instanceof EE_Belongs_To_Relation
+				? strtolower($model_name)
+				: EEH_Inflector::pluralize_and_lower($model_name);
+			$schema['properties'][ $model_name_for_schema ] = $relation->getSchema();
+			$schema['properties'][ $model_name_for_schema ]['relation_model'] = $model_name;
 
-            // links schema
-            $links_key = 'https://api.eventespresso.com/' . strtolower($model_name);
-            $schema['properties']['_links']['properties'][ $links_key ] = array(
-                'description' => esc_html__(
-                    'Array of objects describing the link(s) for this relation resource.',
-                    'event_espresso'
-                ),
-                'type' => 'array',
-                'readonly' => true,
-                'items' => array(
-                    'type' => 'object',
-                    'properties' => array(
-                        'href' => array(
-                            'type' => 'string',
-                            'description' => sprintf(
-                                // translators: placeholder is the model name for the relation.
-                                esc_html__(
-                                    'The link to the resource for the %s relation(s) to this entity',
-                                    'event_espresso'
-                                ),
-                                $model_name
-                            ),
-                        ),
-                        'single' => array(
-                            'type' => 'boolean',
-                            'description' => sprintf(
-                                // translators: placeholder is the model name for the relation.
-                                esc_html__(
-                                    'Whether or not there is only a single %s relation to this entity',
-                                    'event_espresso'
-                                ),
-                                $model_name
-                            ),
-                        ),
-                    ),
-                    'additionalProperties' => false
-                ),
-            );
-        }
-        return $schema;
-    }
+			// links schema
+			$links_key = 'https://api.eventespresso.com/' . strtolower($model_name);
+			$schema['properties']['_links']['properties'][ $links_key ] = array(
+				'description' => esc_html__(
+					'Array of objects describing the link(s) for this relation resource.',
+					'event_espresso'
+				),
+				'type' => 'array',
+				'readonly' => true,
+				'items' => array(
+					'type' => 'object',
+					'properties' => array(
+						'href' => array(
+							'type' => 'string',
+							'description' => sprintf(
+								// translators: placeholder is the model name for the relation.
+								esc_html__(
+									'The link to the resource for the %s relation(s) to this entity',
+									'event_espresso'
+								),
+								$model_name
+							),
+						),
+						'single' => array(
+							'type' => 'boolean',
+							'description' => sprintf(
+								// translators: placeholder is the model name for the relation.
+								esc_html__(
+									'Whether or not there is only a single %s relation to this entity',
+									'event_espresso'
+								),
+								$model_name
+							),
+						),
+					),
+					'additionalProperties' => false
+				),
+			);
+		}
+		return $schema;
+	}
 
 
-    /**
-     * Outputs the schema header for a model.
-     *
-     * @return array
-     */
-    public function getInitialSchemaStructure()
-    {
-        return array(
-            '$schema'    => 'http://json-schema.org/draft-04/schema#',
-            'title'      => $this->model->get_this_model_name(),
-            'type'       => 'object',
-            'properties' => array(
-                'link' => array(
-                    'description' => esc_html__(
-                        'Link to event on WordPress site hosting events.',
-                        'event_espresso'
-                    ),
-                    'type' => 'string',
-                    'readonly' => true,
-                ),
-                '_links' => array(
-                    'description' => esc_html__(
-                        'Various links for resources related to the entity.',
-                        'event_espresso'
-                    ),
-                    'type' => 'object',
-                    'readonly' => true,
-                    'properties' => array(
-                        'self' => array(
-                            'description' => esc_html__(
-                                'Link to this entities resource.',
-                                'event_espresso'
-                            ),
-                            'type' => 'array',
-                            'items' => array(
-                                'type' => 'object',
-                                'properties' => array(
-                                    'href' => array(
-                                        'type' => 'string',
-                                    ),
-                                ),
-                                'additionalProperties' => false
-                            ),
-                            'readonly' => true
-                        ),
-                        'collection' => array(
-                            'description' => esc_html__(
-                                'Link to this entities collection resource.',
-                                'event_espresso'
-                            ),
-                            'type' => 'array',
-                            'items' => array(
-                                'type' => 'object',
-                                'properties' => array(
-                                    'href' => array(
-                                        'type' => 'string'
-                                    ),
-                                ),
-                                'additionalProperties' => false
-                            ),
-                            'readonly' => true
-                        ),
-                    ),
-                    'additionalProperties' => false,
-                ),
-                '_calculated_fields' => array_merge(
-                    $this->fields_calculator->getJsonSchemaForModel($this->model),
-                    array(
-                        '_protected' => $this->getProtectedFieldsSchema()
-                    )
-                ),
-                '_protected' => $this->getProtectedFieldsSchema()
-            ),
-            'additionalProperties' => false,
-        );
-    }
+	/**
+	 * Outputs the schema header for a model.
+	 *
+	 * @return array
+	 */
+	public function getInitialSchemaStructure()
+	{
+		return array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => $this->model->get_this_model_name(),
+			'type'       => 'object',
+			'properties' => array(
+				'link' => array(
+					'description' => esc_html__(
+						'Link to event on WordPress site hosting events.',
+						'event_espresso'
+					),
+					'type' => 'string',
+					'readonly' => true,
+				),
+				'_links' => array(
+					'description' => esc_html__(
+						'Various links for resources related to the entity.',
+						'event_espresso'
+					),
+					'type' => 'object',
+					'readonly' => true,
+					'properties' => array(
+						'self' => array(
+							'description' => esc_html__(
+								'Link to this entities resource.',
+								'event_espresso'
+							),
+							'type' => 'array',
+							'items' => array(
+								'type' => 'object',
+								'properties' => array(
+									'href' => array(
+										'type' => 'string',
+									),
+								),
+								'additionalProperties' => false
+							),
+							'readonly' => true
+						),
+						'collection' => array(
+							'description' => esc_html__(
+								'Link to this entities collection resource.',
+								'event_espresso'
+							),
+							'type' => 'array',
+							'items' => array(
+								'type' => 'object',
+								'properties' => array(
+									'href' => array(
+										'type' => 'string'
+									),
+								),
+								'additionalProperties' => false
+							),
+							'readonly' => true
+						),
+					),
+					'additionalProperties' => false,
+				),
+				'_calculated_fields' => array_merge(
+					$this->fields_calculator->getJsonSchemaForModel($this->model),
+					array(
+						'_protected' => $this->getProtectedFieldsSchema()
+					)
+				),
+				'_protected' => $this->getProtectedFieldsSchema()
+			),
+			'additionalProperties' => false,
+		);
+	}
 
-    /**
-     * Returns an array of JSON schema to describe the _protected property on responses
-     * @since 4.9.74.p
-     * @return array
-     */
-    protected function getProtectedFieldsSchema()
-    {
-        return array(
-            'description' => esc_html__('Array of property names whose values were replaced with their default (because they are related to a password-protected entity.)', 'event_espresso'),
-            'type' => 'array',
-            'items' => array(
-                'description' => esc_html__('Each name corresponds to a property that is protected by password for this entity and has its default value returned in the response.', 'event_espresso'),
-                'type' => 'string',
-                'readonly' => true,
-            ),
-            'readonly' => true
-        );
-    }
+	/**
+	 * Returns an array of JSON schema to describe the _protected property on responses
+	 * @since 4.9.74.p
+	 * @return array
+	 */
+	protected function getProtectedFieldsSchema()
+	{
+		return array(
+			'description' => esc_html__('Array of property names whose values were replaced with their default (because they are related to a password-protected entity.)', 'event_espresso'),
+			'type' => 'array',
+			'items' => array(
+				'description' => esc_html__('Each name corresponds to a property that is protected by password for this entity and has its default value returned in the response.', 'event_espresso'),
+				'type' => 'string',
+				'readonly' => true,
+			),
+			'readonly' => true
+		);
+	}
 
 
-    /**
-     * Allows one to just use the object as a string to get the json.
-     * eg.
-     * $json_schema = new JsonModelSchema(EEM_Event::instance(), new CalculatedModelFields);
-     * // if echoed, would convert schema to a json formatted string.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        $schema = wp_json_encode($this->getModelSchema());
-        return is_string($schema) ? $schema : '';
-    }
+	/**
+	 * Allows one to just use the object as a string to get the json.
+	 * eg.
+	 * $json_schema = new JsonModelSchema(EEM_Event::instance(), new CalculatedModelFields);
+	 * // if echoed, would convert schema to a json formatted string.
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		$schema = wp_json_encode($this->getModelSchema());
+		return is_string($schema) ? $schema : '';
+	}
 }

core/libraries/rest_api/calculations/CalculatedModelFieldsFactory.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
      */
     public function createFromModel($model_name)
     {
-        return $this->createFromClassname('EventEspresso\core\libraries\rest_api\calculations\\' . $model_name);
+        return $this->createFromClassname('EventEspresso\core\libraries\rest_api\calculations\\'.$model_name);
     }
 
     /**
@@ -51,7 +51,7 @@ 
     public function createFromClassname($calculator_classname)
     {
         $calculator = $this->loader->getShared($calculator_classname);
-        if (!$calculator instanceof Base) {
+        if ( ! $calculator instanceof Base) {
             throw new UnexpectedEntityException(
                 $calculator_classname,
                 'EventEspresso\core\libraries\rest_api\calculations\Base'

Indentation +37 added lines, -37 removed lines

@@ -18,46 +18,46 @@
  */
 class CalculatedModelFieldsFactory
 {
-    private $loader;
+	private $loader;
 
-    /**
-     * CalculatedModelFieldsFactory constructor.
-     * @param LoaderInterface $loader
-     */
-    public function __construct(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
+	/**
+	 * CalculatedModelFieldsFactory constructor.
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+	}
 
-    /**
-     * Creates the calculator class that corresponds to that particular model
-     * @since 4.9.68.p
-     * @param string $model_name
-     * @return Base
-     * @throws UnexpectedEntityException
-     */
-    public function createFromModel($model_name)
-    {
-        return $this->createFromClassname('EventEspresso\core\libraries\rest_api\calculations\\' . $model_name);
-    }
+	/**
+	 * Creates the calculator class that corresponds to that particular model
+	 * @since 4.9.68.p
+	 * @param string $model_name
+	 * @return Base
+	 * @throws UnexpectedEntityException
+	 */
+	public function createFromModel($model_name)
+	{
+		return $this->createFromClassname('EventEspresso\core\libraries\rest_api\calculations\\' . $model_name);
+	}
 
-    /**
-     * Creates the calculator class that corresponds to that classname and verifies it's of the correct type
-     * @param string $calculator_classname
-     * @return Base
-     * @throws UnexpectedEntityException
-     */
-    public function createFromClassname($calculator_classname)
-    {
-        $calculator = $this->loader->getShared($calculator_classname);
-        if (!$calculator instanceof Base) {
-            throw new UnexpectedEntityException(
-                $calculator_classname,
-                'EventEspresso\core\libraries\rest_api\calculations\Base'
-            );
-        }
-        return $calculator;
-    }
+	/**
+	 * Creates the calculator class that corresponds to that classname and verifies it's of the correct type
+	 * @param string $calculator_classname
+	 * @return Base
+	 * @throws UnexpectedEntityException
+	 */
+	public function createFromClassname($calculator_classname)
+	{
+		$calculator = $this->loader->getShared($calculator_classname);
+		if (!$calculator instanceof Base) {
+			throw new UnexpectedEntityException(
+				$calculator_classname,
+				'EventEspresso\core\libraries\rest_api\calculations\Base'
+			);
+		}
+		return $calculator;
+	}
 }
 // End of file CalculationsFactory.php
 // Location: EventEspresso\core\libraries\rest_api\calculations/CalculationsFactory.php