eventespresso / event-espresso-core

core/services/assets/AssetManifest.php

Indentation +324 added lines, -324 removed lines

@@ -14,328 +14,328 @@
 class AssetManifest implements AssetManifestInterface
 {
 
-    const ASSET_EXT_CSS      = '.css';
-
-    const ASSET_EXT_JS      = '.js';
-
-    const ASSET_EXT_PHP     = '.php';
-
-    const FILE_NAME         = 'asset-manifest.json';
-
-    const KEY_DEPENDENCIES  = 'dependencies';
-
-    const KEY_ENTRY_POINTS  = 'entrypoints';
-
-    const KEY_FILES         = 'files';
-
-    const KEY_VERSION       = 'version';
-
-
-    /**
-     * @var array
-     */
-    private $asset_files;
-
-    /**
-     * @var string
-     */
-    private $assets_namespace;
-
-    /**
-     * @var string
-     */
-    private $assets_path;
-
-    /**
-     * @var DomainInterface
-     */
-    protected $domain;
-
-    /**
-     * @var array
-     */
-    private $entry_points;
-
-    /**
-     * @var array
-     */
-    private $manifest;
-
-    /**
-     * @var string
-     */
-    private $manifest_path;
-
-    /**
-     * This is a list of known handles that are used for css.
-     * @var array
-     */
-    private $wp_css_handle_dependencies = [
-        'wp-components',
-        'wp-block-editor',
-        'wp-block-library',
-        'wp-edit-post',
-        'wp-edit-widgets',
-        'wp-editor',
-        'wp-format-library',
-        'wp-list-reusable-blocks',
-        'wp-nux',
-    ];
-
-
-    /**
-     * AssetManifest constructor.
-     *
-     * @param DomainInterface $domain
-     */
-    public function __construct(DomainInterface $domain)
-    {
-        $this->domain = $domain;
-        $this->initialize();
-    }
-
-
-    /**
-     * @return void
-     */
-    public function initialize()
-    {
-        if (! $this->manifest) {
-            $this->assets_namespace = $this->domain->assetNamespace();
-            $assets_path = $this->domain->distributionAssetsPath();
-            $this->assets_path = trailingslashit($assets_path);
-            $this->setManifestFilepath();
-            $this->loadManifest();
-            $this->getAssetFiles();
-            $this->getEntryPoints();
-        }
-    }
-
-
-    /**
-     * @param string $manifest_path
-     */
-    public function setManifestFilepath($manifest_path = '')
-    {
-        $manifest_path = $manifest_path ? $manifest_path : $this->assets_path . AssetManifest::FILE_NAME;
-        if (! is_readable($manifest_path)) {
-            throw new AssetManifestException(
-                $manifest_path,
-                '',
-                sprintf(
-                    esc_html__(
-                        'The "%1$s" file was not found or is not readable. Please verify that the file exists and has appropriate permissions.',
-                        'event_espresso'
-                    ),
-                    $manifest_path
-                )
-            );
-        }
-        $this->manifest_path = $manifest_path;
-    }
-
-
-    /**
-     * @return void
-     */
-    private function loadManifest()
-    {
-        if (! $this->manifest) {
-            // TODO May be use WP File system? ¯\_(ツ)_/¯
-            $manifest_json  = file_get_contents($this->manifest_path);
-            $this->manifest = json_decode($manifest_json, true);
-        }
-    }
-
-
-    /**
-     * @param string $file_name
-     * @return string
-     */
-    private function trimAssetFilename($file_name)
-    {
-        return ltrim($file_name, '/');
-    }
-
-
-    /**
-     * @return array
-     */
-    public function getAssetFiles()
-    {
-        if (! $this->asset_files) {
-            if (empty($this->manifest[ AssetManifest::KEY_FILES ])) {
-                if (WP_DEBUG) {
-                    throw new AssetManifestException(AssetManifest::KEY_FILES, $this->manifest_path);
-                }
-                return [];
-            }
-            $this->asset_files = $this->manifest[ AssetManifest::KEY_FILES ];
-        }
-        return $this->asset_files;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function getEntryPoints()
-    {
-        if (! $this->entry_points) {
-            if (empty($this->manifest[ AssetManifest::KEY_ENTRY_POINTS ])) {
-                if (WP_DEBUG) {
-                    throw new AssetManifestException(AssetManifest::KEY_ENTRY_POINTS, $this->manifest_path);
-                }
-                return [];
-            }
-            $this->entry_points = array_keys($this->manifest[ AssetManifest::KEY_ENTRY_POINTS ]);
-        }
-        return $this->entry_points;
-    }
-
-
-    /**
-     * @param string $entry_point
-     * @param string $type
-     * @return string
-     */
-    private function getAsset($entry_point, $type = AssetManifest::ASSET_EXT_JS)
-    {
-        return $this->hasAsset($entry_point, $type)
-            ? $this->trimAssetFilename($this->asset_files[ $entry_point . $type ])
-            : '';
-    }
-
-
-    /**
-     * @param string $entry_point
-     * @param string $type
-     * @return array
-     */
-    public function getAssetDependencies($entry_point, $type = AssetManifest::ASSET_EXT_JS)
-    {
-        $asset = $this->getAssetDetails($entry_point);
-        if (! isset($asset[AssetManifest::KEY_DEPENDENCIES])) {
-            return [];
-        }
-        $dependencies = $asset[AssetManifest::KEY_DEPENDENCIES];
-        // remove cyclical dependencies, if any
-        if (($key = array_search($this->assets_namespace . '-' . $entry_point, $dependencies, true)) !== false) {
-            unset($dependencies[ $key ]);
-        }
-        // currently need to derive dependencies for CSS from the JS dependencies
-        if ($type === AssetManifest::ASSET_EXT_CSS) {
-            $css_dependencies = [];
-            foreach ($dependencies as $handle) {
-                $dependency_style = $this->getEntryPointFromHandle($handle) . AssetManifest::ASSET_EXT_CSS;
-                if (isset($this->asset_files[ $dependency_style ])
-                    || in_array($handle, $this->wp_css_handle_dependencies)
-                ) {
-                    $css_dependencies[] = $handle;
-                }
-            }
-            return $css_dependencies;
-        }
-        return $dependencies;
-    }
-
-
-    /**
-     * @param string $entry_point
-     * @return array
-     */
-    public function getAssetDetails($entry_point)
-    {
-        $file_name = $this->getAsset($entry_point, AssetManifest::ASSET_EXT_PHP);
-        if (! $file_name) {
-            return [];
-        }
-        $full_path = $this->assets_path . $file_name;
-        if (! is_readable($full_path)) {
-            if (WP_DEBUG) {
-                throw new AssetManifestException(AssetManifest::KEY_DEPENDENCIES, $full_path);
-            }
-            return [];
-        }
-        return require($full_path);
-    }
-
-
-    /**
-     * @param string $entry_point
-     * @return string|int|false
-     */
-    public function getAssetHandle($entry_point)
-    {
-        return $this->assets_namespace . '-' . $entry_point;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getAssetsPath()
-    {
-        return $this->assets_path;
-    }
-
-
-    /**
-     * @param string $handle
-     * @return string|int|false
-     */
-    private function getEntryPointFromHandle($handle)
-    {   $find = $this->assets_namespace . '-';
-        return str_replace($find, '', $handle);
-    }
-
-
-    /**
-     * @param string $entry_point
-     * @param string $type
-     * @return string
-     */
-    public function getAssetPath($entry_point, $type = AssetManifest::ASSET_EXT_JS)
-    {
-        $file_name = $this->getAsset($entry_point, $type);
-        return $file_name ? $this->domain->distributionAssetsPath($file_name) : '';
-    }
-
-
-    /**
-     * @param string $entry_point
-     * @param string $type
-     * @return string
-     */
-    public function getAssetUrl($entry_point, $type = AssetManifest::ASSET_EXT_JS)
-    {
-        $file_name = $this->getAsset($entry_point, $type);
-        return $file_name ? $this->domain->distributionAssetsUrl($file_name) : '';
-    }
-
-
-    /**
-     * @param string $entry_point
-     * @param string $type
-     * @return string|int|false
-     */
-    public function getAssetVersion($entry_point, $type = AssetManifest::ASSET_EXT_JS)
-    {
-        $asset = $this->getAssetDetails($entry_point);
-        return $type === AssetManifest::ASSET_EXT_JS && isset($asset[AssetManifest::KEY_VERSION])
-            ? $asset[AssetManifest::KEY_VERSION]
-            : filemtime($this->getAssetPath($entry_point, $type));
-    }
-
-
-    /**
-     * @param string $entry_point
-     * @param string $type
-     * @return string
-     */
-    public function hasAsset($entry_point, $type = AssetManifest::ASSET_EXT_JS)
-    {
-        $file_name = $entry_point . $type;
-        return ! empty($this->asset_files[ $file_name ]);
-    }
+	const ASSET_EXT_CSS      = '.css';
+
+	const ASSET_EXT_JS      = '.js';
+
+	const ASSET_EXT_PHP     = '.php';
+
+	const FILE_NAME         = 'asset-manifest.json';
+
+	const KEY_DEPENDENCIES  = 'dependencies';
+
+	const KEY_ENTRY_POINTS  = 'entrypoints';
+
+	const KEY_FILES         = 'files';
+
+	const KEY_VERSION       = 'version';
+
+
+	/**
+	 * @var array
+	 */
+	private $asset_files;
+
+	/**
+	 * @var string
+	 */
+	private $assets_namespace;
+
+	/**
+	 * @var string
+	 */
+	private $assets_path;
+
+	/**
+	 * @var DomainInterface
+	 */
+	protected $domain;
+
+	/**
+	 * @var array
+	 */
+	private $entry_points;
+
+	/**
+	 * @var array
+	 */
+	private $manifest;
+
+	/**
+	 * @var string
+	 */
+	private $manifest_path;
+
+	/**
+	 * This is a list of known handles that are used for css.
+	 * @var array
+	 */
+	private $wp_css_handle_dependencies = [
+		'wp-components',
+		'wp-block-editor',
+		'wp-block-library',
+		'wp-edit-post',
+		'wp-edit-widgets',
+		'wp-editor',
+		'wp-format-library',
+		'wp-list-reusable-blocks',
+		'wp-nux',
+	];
+
+
+	/**
+	 * AssetManifest constructor.
+	 *
+	 * @param DomainInterface $domain
+	 */
+	public function __construct(DomainInterface $domain)
+	{
+		$this->domain = $domain;
+		$this->initialize();
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function initialize()
+	{
+		if (! $this->manifest) {
+			$this->assets_namespace = $this->domain->assetNamespace();
+			$assets_path = $this->domain->distributionAssetsPath();
+			$this->assets_path = trailingslashit($assets_path);
+			$this->setManifestFilepath();
+			$this->loadManifest();
+			$this->getAssetFiles();
+			$this->getEntryPoints();
+		}
+	}
+
+
+	/**
+	 * @param string $manifest_path
+	 */
+	public function setManifestFilepath($manifest_path = '')
+	{
+		$manifest_path = $manifest_path ? $manifest_path : $this->assets_path . AssetManifest::FILE_NAME;
+		if (! is_readable($manifest_path)) {
+			throw new AssetManifestException(
+				$manifest_path,
+				'',
+				sprintf(
+					esc_html__(
+						'The "%1$s" file was not found or is not readable. Please verify that the file exists and has appropriate permissions.',
+						'event_espresso'
+					),
+					$manifest_path
+				)
+			);
+		}
+		$this->manifest_path = $manifest_path;
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function loadManifest()
+	{
+		if (! $this->manifest) {
+			// TODO May be use WP File system? ¯\_(ツ)_/¯
+			$manifest_json  = file_get_contents($this->manifest_path);
+			$this->manifest = json_decode($manifest_json, true);
+		}
+	}
+
+
+	/**
+	 * @param string $file_name
+	 * @return string
+	 */
+	private function trimAssetFilename($file_name)
+	{
+		return ltrim($file_name, '/');
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function getAssetFiles()
+	{
+		if (! $this->asset_files) {
+			if (empty($this->manifest[ AssetManifest::KEY_FILES ])) {
+				if (WP_DEBUG) {
+					throw new AssetManifestException(AssetManifest::KEY_FILES, $this->manifest_path);
+				}
+				return [];
+			}
+			$this->asset_files = $this->manifest[ AssetManifest::KEY_FILES ];
+		}
+		return $this->asset_files;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function getEntryPoints()
+	{
+		if (! $this->entry_points) {
+			if (empty($this->manifest[ AssetManifest::KEY_ENTRY_POINTS ])) {
+				if (WP_DEBUG) {
+					throw new AssetManifestException(AssetManifest::KEY_ENTRY_POINTS, $this->manifest_path);
+				}
+				return [];
+			}
+			$this->entry_points = array_keys($this->manifest[ AssetManifest::KEY_ENTRY_POINTS ]);
+		}
+		return $this->entry_points;
+	}
+
+
+	/**
+	 * @param string $entry_point
+	 * @param string $type
+	 * @return string
+	 */
+	private function getAsset($entry_point, $type = AssetManifest::ASSET_EXT_JS)
+	{
+		return $this->hasAsset($entry_point, $type)
+			? $this->trimAssetFilename($this->asset_files[ $entry_point . $type ])
+			: '';
+	}
+
+
+	/**
+	 * @param string $entry_point
+	 * @param string $type
+	 * @return array
+	 */
+	public function getAssetDependencies($entry_point, $type = AssetManifest::ASSET_EXT_JS)
+	{
+		$asset = $this->getAssetDetails($entry_point);
+		if (! isset($asset[AssetManifest::KEY_DEPENDENCIES])) {
+			return [];
+		}
+		$dependencies = $asset[AssetManifest::KEY_DEPENDENCIES];
+		// remove cyclical dependencies, if any
+		if (($key = array_search($this->assets_namespace . '-' . $entry_point, $dependencies, true)) !== false) {
+			unset($dependencies[ $key ]);
+		}
+		// currently need to derive dependencies for CSS from the JS dependencies
+		if ($type === AssetManifest::ASSET_EXT_CSS) {
+			$css_dependencies = [];
+			foreach ($dependencies as $handle) {
+				$dependency_style = $this->getEntryPointFromHandle($handle) . AssetManifest::ASSET_EXT_CSS;
+				if (isset($this->asset_files[ $dependency_style ])
+					|| in_array($handle, $this->wp_css_handle_dependencies)
+				) {
+					$css_dependencies[] = $handle;
+				}
+			}
+			return $css_dependencies;
+		}
+		return $dependencies;
+	}
+
+
+	/**
+	 * @param string $entry_point
+	 * @return array
+	 */
+	public function getAssetDetails($entry_point)
+	{
+		$file_name = $this->getAsset($entry_point, AssetManifest::ASSET_EXT_PHP);
+		if (! $file_name) {
+			return [];
+		}
+		$full_path = $this->assets_path . $file_name;
+		if (! is_readable($full_path)) {
+			if (WP_DEBUG) {
+				throw new AssetManifestException(AssetManifest::KEY_DEPENDENCIES, $full_path);
+			}
+			return [];
+		}
+		return require($full_path);
+	}
+
+
+	/**
+	 * @param string $entry_point
+	 * @return string|int|false
+	 */
+	public function getAssetHandle($entry_point)
+	{
+		return $this->assets_namespace . '-' . $entry_point;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getAssetsPath()
+	{
+		return $this->assets_path;
+	}
+
+
+	/**
+	 * @param string $handle
+	 * @return string|int|false
+	 */
+	private function getEntryPointFromHandle($handle)
+	{   $find = $this->assets_namespace . '-';
+		return str_replace($find, '', $handle);
+	}
+
+
+	/**
+	 * @param string $entry_point
+	 * @param string $type
+	 * @return string
+	 */
+	public function getAssetPath($entry_point, $type = AssetManifest::ASSET_EXT_JS)
+	{
+		$file_name = $this->getAsset($entry_point, $type);
+		return $file_name ? $this->domain->distributionAssetsPath($file_name) : '';
+	}
+
+
+	/**
+	 * @param string $entry_point
+	 * @param string $type
+	 * @return string
+	 */
+	public function getAssetUrl($entry_point, $type = AssetManifest::ASSET_EXT_JS)
+	{
+		$file_name = $this->getAsset($entry_point, $type);
+		return $file_name ? $this->domain->distributionAssetsUrl($file_name) : '';
+	}
+
+
+	/**
+	 * @param string $entry_point
+	 * @param string $type
+	 * @return string|int|false
+	 */
+	public function getAssetVersion($entry_point, $type = AssetManifest::ASSET_EXT_JS)
+	{
+		$asset = $this->getAssetDetails($entry_point);
+		return $type === AssetManifest::ASSET_EXT_JS && isset($asset[AssetManifest::KEY_VERSION])
+			? $asset[AssetManifest::KEY_VERSION]
+			: filemtime($this->getAssetPath($entry_point, $type));
+	}
+
+
+	/**
+	 * @param string $entry_point
+	 * @param string $type
+	 * @return string
+	 */
+	public function hasAsset($entry_point, $type = AssetManifest::ASSET_EXT_JS)
+	{
+		$file_name = $entry_point . $type;
+		return ! empty($this->asset_files[ $file_name ]);
+	}
 }

Spacing +24 added lines, -24 removed lines

@@ -14,7 +14,7 @@ 
 class AssetManifest implements AssetManifestInterface
 {
 
-    const ASSET_EXT_CSS      = '.css';
+    const ASSET_EXT_CSS = '.css';
 
     const ASSET_EXT_JS      = '.js';
 
@@ -100,7 +100,7 @@ 
      */
     public function initialize()
     {
-        if (! $this->manifest) {
+        if ( ! $this->manifest) {
             $this->assets_namespace = $this->domain->assetNamespace();
             $assets_path = $this->domain->distributionAssetsPath();
             $this->assets_path = trailingslashit($assets_path);
@@ -117,8 +117,8 @@ 
      */
     public function setManifestFilepath($manifest_path = '')
     {
-        $manifest_path = $manifest_path ? $manifest_path : $this->assets_path . AssetManifest::FILE_NAME;
-        if (! is_readable($manifest_path)) {
+        $manifest_path = $manifest_path ? $manifest_path : $this->assets_path.AssetManifest::FILE_NAME;
+        if ( ! is_readable($manifest_path)) {
             throw new AssetManifestException(
                 $manifest_path,
                 '',
@@ -140,7 +140,7 @@ 
      */
     private function loadManifest()
     {
-        if (! $this->manifest) {
+        if ( ! $this->manifest) {
             // TODO May be use WP File system? ¯\_(ツ)_/¯
             $manifest_json  = file_get_contents($this->manifest_path);
             $this->manifest = json_decode($manifest_json, true);
@@ -163,14 +163,14 @@ 
      */
     public function getAssetFiles()
     {
-        if (! $this->asset_files) {
-            if (empty($this->manifest[ AssetManifest::KEY_FILES ])) {
+        if ( ! $this->asset_files) {
+            if (empty($this->manifest[AssetManifest::KEY_FILES])) {
                 if (WP_DEBUG) {
                     throw new AssetManifestException(AssetManifest::KEY_FILES, $this->manifest_path);
                 }
                 return [];
             }
-            $this->asset_files = $this->manifest[ AssetManifest::KEY_FILES ];
+            $this->asset_files = $this->manifest[AssetManifest::KEY_FILES];
         }
         return $this->asset_files;
     }
@@ -181,14 +181,14 @@ 
      */
     public function getEntryPoints()
     {
-        if (! $this->entry_points) {
-            if (empty($this->manifest[ AssetManifest::KEY_ENTRY_POINTS ])) {
+        if ( ! $this->entry_points) {
+            if (empty($this->manifest[AssetManifest::KEY_ENTRY_POINTS])) {
                 if (WP_DEBUG) {
                     throw new AssetManifestException(AssetManifest::KEY_ENTRY_POINTS, $this->manifest_path);
                 }
                 return [];
             }
-            $this->entry_points = array_keys($this->manifest[ AssetManifest::KEY_ENTRY_POINTS ]);
+            $this->entry_points = array_keys($this->manifest[AssetManifest::KEY_ENTRY_POINTS]);
         }
         return $this->entry_points;
     }
@@ -202,7 +202,7 @@ 
     private function getAsset($entry_point, $type = AssetManifest::ASSET_EXT_JS)
     {
         return $this->hasAsset($entry_point, $type)
-            ? $this->trimAssetFilename($this->asset_files[ $entry_point . $type ])
+            ? $this->trimAssetFilename($this->asset_files[$entry_point.$type])
             : '';
     }
 
@@ -215,20 +215,20 @@ 
     public function getAssetDependencies($entry_point, $type = AssetManifest::ASSET_EXT_JS)
     {
         $asset = $this->getAssetDetails($entry_point);
-        if (! isset($asset[AssetManifest::KEY_DEPENDENCIES])) {
+        if ( ! isset($asset[AssetManifest::KEY_DEPENDENCIES])) {
             return [];
         }
         $dependencies = $asset[AssetManifest::KEY_DEPENDENCIES];
         // remove cyclical dependencies, if any
-        if (($key = array_search($this->assets_namespace . '-' . $entry_point, $dependencies, true)) !== false) {
-            unset($dependencies[ $key ]);
+        if (($key = array_search($this->assets_namespace.'-'.$entry_point, $dependencies, true)) !== false) {
+            unset($dependencies[$key]);
         }
         // currently need to derive dependencies for CSS from the JS dependencies
         if ($type === AssetManifest::ASSET_EXT_CSS) {
             $css_dependencies = [];
             foreach ($dependencies as $handle) {
-                $dependency_style = $this->getEntryPointFromHandle($handle) . AssetManifest::ASSET_EXT_CSS;
-                if (isset($this->asset_files[ $dependency_style ])
+                $dependency_style = $this->getEntryPointFromHandle($handle).AssetManifest::ASSET_EXT_CSS;
+                if (isset($this->asset_files[$dependency_style])
                     || in_array($handle, $this->wp_css_handle_dependencies)
                 ) {
                     $css_dependencies[] = $handle;
@@ -247,11 +247,11 @@ 
     public function getAssetDetails($entry_point)
     {
         $file_name = $this->getAsset($entry_point, AssetManifest::ASSET_EXT_PHP);
-        if (! $file_name) {
+        if ( ! $file_name) {
             return [];
         }
-        $full_path = $this->assets_path . $file_name;
-        if (! is_readable($full_path)) {
+        $full_path = $this->assets_path.$file_name;
+        if ( ! is_readable($full_path)) {
             if (WP_DEBUG) {
                 throw new AssetManifestException(AssetManifest::KEY_DEPENDENCIES, $full_path);
             }
@@ -267,7 +267,7 @@ 
      */
     public function getAssetHandle($entry_point)
     {
-        return $this->assets_namespace . '-' . $entry_point;
+        return $this->assets_namespace.'-'.$entry_point;
     }
 
 
@@ -285,7 +285,7 @@ 
      * @return string|int|false
      */
     private function getEntryPointFromHandle($handle)
-    {   $find = $this->assets_namespace . '-';
+    {   $find = $this->assets_namespace.'-';
         return str_replace($find, '', $handle);
     }
 
@@ -335,7 +335,7 @@ 
      */
     public function hasAsset($entry_point, $type = AssetManifest::ASSET_EXT_JS)
     {
-        $file_name = $entry_point . $type;
-        return ! empty($this->asset_files[ $file_name ]);
+        $file_name = $entry_point.$type;
+        return ! empty($this->asset_files[$file_name]);
     }
 }

core/services/assets/BaristaFactory.php

Spacing +3 added lines, -3 removed lines

@@ -72,13 +72,13 @@
     private function getBaristaForDomain(AssetManifestInterface $asset_manifest, DomainInterface $domain)
     {
         $domain_fqcn = get_class($domain);
-        if (! isset(BaristaFactory::$baristas[ $domain_fqcn ])) {
+        if ( ! isset(BaristaFactory::$baristas[$domain_fqcn])) {
             $barista = new Barista($asset_manifest);
             // we still need to share this with the core loader to facilitate automatic dependency injection
             $this->loader->share(Barista::class, $barista, [$asset_manifest]);
-            BaristaFactory::$baristas[ $domain_fqcn ] = $barista;
+            BaristaFactory::$baristas[$domain_fqcn] = $barista;
         }
-        return BaristaFactory::$baristas[ $domain_fqcn ];
+        return BaristaFactory::$baristas[$domain_fqcn];
     }
 
 

Indentation +109 added lines, -109 removed lines

@@ -11,114 +11,114 @@
 
 class BaristaFactory implements FactoryInterface
 {
-    /**
-     * @var AssetManifestFactory
-     */
-    private $manifest_factory;
-
-    /**
-     * @var BaristaInterface[]
-     */
-    private static $baristas = [];
-
-    /**
-     * @var LoaderInterface $loader
-     */
-    protected $loader;
-
-
-    /**
-     * BaristaFactory constructor.
-     *
-     * @param AssetManifestFactory $manifest_factory
-     * @param LoaderInterface      $loader
-     */
-    public function __construct(AssetManifestFactory $manifest_factory, LoaderInterface $loader)
-    {
-        $this->manifest_factory = $manifest_factory;
-        $this->loader           = $loader;
-    }
-
-
-    /**
-     * @param string $domain_fqcn
-     * @return BaristaInterface
-     */
-    public function createFromDomainClass($domain_fqcn)
-    {
-        /** @var DomainInterface $domain */
-        $domain = $this->loader->getShared($domain_fqcn);
-        return $this->createFromDomainObject($domain);
-    }
-
-
-    /**
-     * @param DomainInterface $domain
-     * @return BaristaInterface
-     */
-    public function createFromDomainObject(DomainInterface $domain)
-    {
-        $asset_manifest = $this->manifest_factory->createFromDomainObject($domain);
-        return $this->getBaristaForDomain($asset_manifest, $domain);
-    }
-
-
-    /**
-     * @param string $domain_fqcn      Fully Qualified Class Name for the applicable DomainInterface class
-     * @param array  $domain_arguments arguments required by the applicable DomainInterface class
-     * @return BaristaInterface
-     */
-    public function create($domain_fqcn = '', array $domain_arguments = [])
-    {
-        $domain         = $this->getDomain($domain_fqcn, $domain_arguments);
-        $asset_manifest = $this->manifest_factory->createFromDomainObject($domain);
-        return $this->getBaristaForDomain($asset_manifest, $domain);
-    }
-
-
-    /**
-     * @param AssetManifestInterface $asset_manifest
-     * @param DomainInterface        $domain
-     * @return BaristaInterface
-     */
-    private function getBaristaForDomain(AssetManifestInterface $asset_manifest, DomainInterface $domain)
-    {
-        $domain_fqcn = get_class($domain);
-        if (! isset(BaristaFactory::$baristas[ $domain_fqcn ])) {
-            $barista = new Barista($asset_manifest);
-            // we still need to share this with the core loader to facilitate automatic dependency injection
-            $this->loader->share(Barista::class, $barista, [$asset_manifest]);
-            BaristaFactory::$baristas[ $domain_fqcn ] = $barista;
-        }
-        return BaristaFactory::$baristas[ $domain_fqcn ];
-    }
-
-
-    /**
-     * @param string $domain_fqcn Fully Qualified Class Name for the applicable DomainInterface class
-     * @param array  $arguments
-     * @return DomainInterface
-     */
-    private function getDomain($domain_fqcn, array $arguments = [])
-    {
-        // if no FQCN is supplied for the domain, then we are loading the defaults for core
-        // add-ons will always have to supply their domain FQCN and arguments to retrieve their manifest
-        $domain = empty($domain_fqcn)
-            ? DomainFactory::getEventEspressoCoreDomain()
-            : DomainFactory::getShared(new FullyQualifiedName($domain_fqcn), $arguments);
-        if ($domain instanceof DomainInterface) {
-            return $domain;
-        }
-        throw new DomainException(
-            sprintf(
-                esc_html__(
-                    'BaristaFactory::create() requires a fully qualified class name (FQCN) for the currently applicable Domain object.
+	/**
+	 * @var AssetManifestFactory
+	 */
+	private $manifest_factory;
+
+	/**
+	 * @var BaristaInterface[]
+	 */
+	private static $baristas = [];
+
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	protected $loader;
+
+
+	/**
+	 * BaristaFactory constructor.
+	 *
+	 * @param AssetManifestFactory $manifest_factory
+	 * @param LoaderInterface      $loader
+	 */
+	public function __construct(AssetManifestFactory $manifest_factory, LoaderInterface $loader)
+	{
+		$this->manifest_factory = $manifest_factory;
+		$this->loader           = $loader;
+	}
+
+
+	/**
+	 * @param string $domain_fqcn
+	 * @return BaristaInterface
+	 */
+	public function createFromDomainClass($domain_fqcn)
+	{
+		/** @var DomainInterface $domain */
+		$domain = $this->loader->getShared($domain_fqcn);
+		return $this->createFromDomainObject($domain);
+	}
+
+
+	/**
+	 * @param DomainInterface $domain
+	 * @return BaristaInterface
+	 */
+	public function createFromDomainObject(DomainInterface $domain)
+	{
+		$asset_manifest = $this->manifest_factory->createFromDomainObject($domain);
+		return $this->getBaristaForDomain($asset_manifest, $domain);
+	}
+
+
+	/**
+	 * @param string $domain_fqcn      Fully Qualified Class Name for the applicable DomainInterface class
+	 * @param array  $domain_arguments arguments required by the applicable DomainInterface class
+	 * @return BaristaInterface
+	 */
+	public function create($domain_fqcn = '', array $domain_arguments = [])
+	{
+		$domain         = $this->getDomain($domain_fqcn, $domain_arguments);
+		$asset_manifest = $this->manifest_factory->createFromDomainObject($domain);
+		return $this->getBaristaForDomain($asset_manifest, $domain);
+	}
+
+
+	/**
+	 * @param AssetManifestInterface $asset_manifest
+	 * @param DomainInterface        $domain
+	 * @return BaristaInterface
+	 */
+	private function getBaristaForDomain(AssetManifestInterface $asset_manifest, DomainInterface $domain)
+	{
+		$domain_fqcn = get_class($domain);
+		if (! isset(BaristaFactory::$baristas[ $domain_fqcn ])) {
+			$barista = new Barista($asset_manifest);
+			// we still need to share this with the core loader to facilitate automatic dependency injection
+			$this->loader->share(Barista::class, $barista, [$asset_manifest]);
+			BaristaFactory::$baristas[ $domain_fqcn ] = $barista;
+		}
+		return BaristaFactory::$baristas[ $domain_fqcn ];
+	}
+
+
+	/**
+	 * @param string $domain_fqcn Fully Qualified Class Name for the applicable DomainInterface class
+	 * @param array  $arguments
+	 * @return DomainInterface
+	 */
+	private function getDomain($domain_fqcn, array $arguments = [])
+	{
+		// if no FQCN is supplied for the domain, then we are loading the defaults for core
+		// add-ons will always have to supply their domain FQCN and arguments to retrieve their manifest
+		$domain = empty($domain_fqcn)
+			? DomainFactory::getEventEspressoCoreDomain()
+			: DomainFactory::getShared(new FullyQualifiedName($domain_fqcn), $arguments);
+		if ($domain instanceof DomainInterface) {
+			return $domain;
+		}
+		throw new DomainException(
+			sprintf(
+				esc_html__(
+					'BaristaFactory::create() requires a fully qualified class name (FQCN) for the currently applicable Domain object.
                     %1$sThe supplied FQCN ("%2$s") is either invalid or the class is missing.',
-                    'event_espresso'
-                ),
-                '<br />',
-                $domain_fqcn
-            )
-        );
-    }
+					'event_espresso'
+				),
+				'<br />',
+				$domain_fqcn
+			)
+		);
+	}
 }

core/services/assets/JedLocaleData.php

Indentation +30 added lines, -30 removed lines

@@ -15,35 +15,35 @@
 class JedLocaleData
 {
 
-    /**
-     * @var array $locales
-     */
-    protected $locales = [];
+	/**
+	 * @var array $locales
+	 */
+	protected $locales = [];
 
-    /**
-     * Returns Jed-formatted localization data.
-     *
-     * @param string $domain Translation domain.
-     * @return array
-     */
-    public function getData($domain = Domain::TEXT_DOMAIN)
-    {
-        if (! isset($locales[ $domain ])) {
-            $translations = get_translations_for_domain($domain);
-            $locale = [
-                '' => [
-                    'domain' => $domain,
-                    'lang'   => is_admin() ? EEH_DTT_Helper::get_user_locale() : get_locale()
-                ],
-            ];
-            if (! empty($translations->headers['Plural-Forms'])) {
-                $locale['']['plural_forms'] = $translations->headers['Plural-Forms'];
-            }
-            foreach ($translations->entries as $id => $entry) {
-                $locale[ $id ] = $entry->translations;
-            }
-            $locales[ $domain ] = $locale;
-        }
-        return $locales[ $domain ];
-    }
+	/**
+	 * Returns Jed-formatted localization data.
+	 *
+	 * @param string $domain Translation domain.
+	 * @return array
+	 */
+	public function getData($domain = Domain::TEXT_DOMAIN)
+	{
+		if (! isset($locales[ $domain ])) {
+			$translations = get_translations_for_domain($domain);
+			$locale = [
+				'' => [
+					'domain' => $domain,
+					'lang'   => is_admin() ? EEH_DTT_Helper::get_user_locale() : get_locale()
+				],
+			];
+			if (! empty($translations->headers['Plural-Forms'])) {
+				$locale['']['plural_forms'] = $translations->headers['Plural-Forms'];
+			}
+			foreach ($translations->entries as $id => $entry) {
+				$locale[ $id ] = $entry->translations;
+			}
+			$locales[ $domain ] = $locale;
+		}
+		return $locales[ $domain ];
+	}
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
      */
     public function getData($domain = Domain::TEXT_DOMAIN)
     {
-        if (! isset($locales[ $domain ])) {
+        if ( ! isset($locales[$domain])) {
             $translations = get_translations_for_domain($domain);
             $locale = [
                 '' => [
@@ -36,14 +36,14 @@ 
                     'lang'   => is_admin() ? EEH_DTT_Helper::get_user_locale() : get_locale()
                 ],
             ];
-            if (! empty($translations->headers['Plural-Forms'])) {
+            if ( ! empty($translations->headers['Plural-Forms'])) {
                 $locale['']['plural_forms'] = $translations->headers['Plural-Forms'];
             }
             foreach ($translations->entries as $id => $entry) {
-                $locale[ $id ] = $entry->translations;
+                $locale[$id] = $entry->translations;
             }
-            $locales[ $domain ] = $locale;
+            $locales[$domain] = $locale;
         }
-        return $locales[ $domain ];
+        return $locales[$domain];
     }
 }
\ No newline at end of file

core/domain/values/assets/JavascriptAsset.php

Spacing +2 added lines, -2 removed lines

@@ -150,7 +150,7 @@ 
             return;
         }
         $attributes = $this->getAttributes();
-        if (!empty($attributes)) {
+        if ( ! empty($attributes)) {
             add_filter('script_loader_tag', [$this, 'addAttributeTagsToScript'], 10, 2);
         }
         wp_enqueue_script($this->handle());
@@ -169,7 +169,7 @@ 
                     $attributes_string .= " {$key}='{$value}'";
                 }
             }
-            $tag = str_replace('></script>', $attributes_string . '></script>', $tag);
+            $tag = str_replace('></script>', $attributes_string.'></script>', $tag);
         }
 
         return $tag;

Indentation +168 added lines, -168 removed lines

@@ -18,172 +18,172 @@
 class JavascriptAsset extends BrowserAsset
 {
 
-    /**
-     * @var boolean $load_in_footer
-     */
-    private $load_in_footer = false;
-
-    /**
-     * @var boolean $requires_translation
-     */
-    private $requires_translation = false;
-
-    /**
-     * @var boolean $has_inline_data
-     */
-    private $has_inline_data = false;
-
-    /**
-     * @var Closure $inline_data_callback
-     */
-    private $inline_data_callback;
-
-
-    /**
-     * Asset constructor.
-     *
-     * @param string          $handle
-     * @param string          $source
-     * @param array           $dependencies
-     * @param bool            $load_in_footer
-     * @param DomainInterface $domain
-     * @param string          $version
-     * @throws InvalidDataTypeException
-     * @throws DomainException
-     */
-    public function __construct(
-        $handle,
-        $source,
-        array $dependencies,
-        $load_in_footer,
-        DomainInterface $domain,
-        $version = ''
-    ) {
-        parent::__construct(Asset::TYPE_JS, $handle, $source, $dependencies, $domain, $version);
-        $this->setLoadInFooter($load_in_footer);
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function loadInFooter()
-    {
-        return $this->load_in_footer;
-    }
-
-
-    /**
-     * @param bool $load_in_footer
-     */
-    private function setLoadInFooter($load_in_footer = true)
-    {
-        $this->load_in_footer = filter_var($load_in_footer, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function requiresTranslation()
-    {
-        return $this->requires_translation;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function hasInlineData()
-    {
-        return $this->has_inline_data;
-    }
-
-
-    /**
-     * @param bool $has_inline_data
-     * @return JavascriptAsset
-     */
-    public function setHasInlineData($has_inline_data = true)
-    {
-        $this->has_inline_data = filter_var($has_inline_data, FILTER_VALIDATE_BOOLEAN);
-        return $this;
-    }
-
-
-    /**
-     * @return Closure
-     */
-    public function inlineDataCallback()
-    {
-        return $this->inline_data_callback;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function hasInlineDataCallback()
-    {
-        return $this->inline_data_callback instanceof Closure;
-    }
-
-
-    /**
-     * @param Closure $inline_data_callback
-     * @return JavascriptAsset
-     */
-    public function setInlineDataCallback(Closure $inline_data_callback)
-    {
-        $this->inline_data_callback = $inline_data_callback;
-        $this->setHasInlineData();
-        return $this;
-    }
-
-
-    /**
-     * @since 4.9.62.p
-     */
-    public function enqueueAsset()
-    {
-        if ($this->source() === '') {
-            return;
-        }
-        $attributes = $this->getAttributes();
-        if (!empty($attributes)) {
-            add_filter('script_loader_tag', [$this, 'addAttributeTagsToScript'], 10, 2);
-        }
-        wp_enqueue_script($this->handle());
-    }
-
-
-    public function addAttributeTagsToScript($tag, $handle)
-    {
-        if ($handle === $this->handle()) {
-            $attributes = $this->getAttributes();
-            $attributes_string = '';
-            foreach ($attributes as $key => $value) {
-                if (is_int($key)) {
-                    $attributes_string .= " {$value}";
-                } else {
-                    $attributes_string .= " {$key}='{$value}'";
-                }
-            }
-            $tag = str_replace('></script>', $attributes_string . '></script>', $tag);
-        }
-
-        return $tag;
-    }
-
-
-    /**
-     * @deprecated 5.0.0.p
-     * @param bool $requires_translation
-     * @return JavascriptAsset
-     */
-    public function setRequiresTranslation($requires_translation = true)
-    {
-        $this->requires_translation = filter_var($requires_translation, FILTER_VALIDATE_BOOLEAN);
-        return $this;
-    }
+	/**
+	 * @var boolean $load_in_footer
+	 */
+	private $load_in_footer = false;
+
+	/**
+	 * @var boolean $requires_translation
+	 */
+	private $requires_translation = false;
+
+	/**
+	 * @var boolean $has_inline_data
+	 */
+	private $has_inline_data = false;
+
+	/**
+	 * @var Closure $inline_data_callback
+	 */
+	private $inline_data_callback;
+
+
+	/**
+	 * Asset constructor.
+	 *
+	 * @param string          $handle
+	 * @param string          $source
+	 * @param array           $dependencies
+	 * @param bool            $load_in_footer
+	 * @param DomainInterface $domain
+	 * @param string          $version
+	 * @throws InvalidDataTypeException
+	 * @throws DomainException
+	 */
+	public function __construct(
+		$handle,
+		$source,
+		array $dependencies,
+		$load_in_footer,
+		DomainInterface $domain,
+		$version = ''
+	) {
+		parent::__construct(Asset::TYPE_JS, $handle, $source, $dependencies, $domain, $version);
+		$this->setLoadInFooter($load_in_footer);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function loadInFooter()
+	{
+		return $this->load_in_footer;
+	}
+
+
+	/**
+	 * @param bool $load_in_footer
+	 */
+	private function setLoadInFooter($load_in_footer = true)
+	{
+		$this->load_in_footer = filter_var($load_in_footer, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function requiresTranslation()
+	{
+		return $this->requires_translation;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function hasInlineData()
+	{
+		return $this->has_inline_data;
+	}
+
+
+	/**
+	 * @param bool $has_inline_data
+	 * @return JavascriptAsset
+	 */
+	public function setHasInlineData($has_inline_data = true)
+	{
+		$this->has_inline_data = filter_var($has_inline_data, FILTER_VALIDATE_BOOLEAN);
+		return $this;
+	}
+
+
+	/**
+	 * @return Closure
+	 */
+	public function inlineDataCallback()
+	{
+		return $this->inline_data_callback;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function hasInlineDataCallback()
+	{
+		return $this->inline_data_callback instanceof Closure;
+	}
+
+
+	/**
+	 * @param Closure $inline_data_callback
+	 * @return JavascriptAsset
+	 */
+	public function setInlineDataCallback(Closure $inline_data_callback)
+	{
+		$this->inline_data_callback = $inline_data_callback;
+		$this->setHasInlineData();
+		return $this;
+	}
+
+
+	/**
+	 * @since 4.9.62.p
+	 */
+	public function enqueueAsset()
+	{
+		if ($this->source() === '') {
+			return;
+		}
+		$attributes = $this->getAttributes();
+		if (!empty($attributes)) {
+			add_filter('script_loader_tag', [$this, 'addAttributeTagsToScript'], 10, 2);
+		}
+		wp_enqueue_script($this->handle());
+	}
+
+
+	public function addAttributeTagsToScript($tag, $handle)
+	{
+		if ($handle === $this->handle()) {
+			$attributes = $this->getAttributes();
+			$attributes_string = '';
+			foreach ($attributes as $key => $value) {
+				if (is_int($key)) {
+					$attributes_string .= " {$value}";
+				} else {
+					$attributes_string .= " {$key}='{$value}'";
+				}
+			}
+			$tag = str_replace('></script>', $attributes_string . '></script>', $tag);
+		}
+
+		return $tag;
+	}
+
+
+	/**
+	 * @deprecated 5.0.0.p
+	 * @param bool $requires_translation
+	 * @return JavascriptAsset
+	 */
+	public function setRequiresTranslation($requires_translation = true)
+	{
+		$this->requires_translation = filter_var($requires_translation, FILTER_VALIDATE_BOOLEAN);
+		return $this;
+	}
 }

core/domain/services/assets/EventEditorAssetManager.php

Indentation +12 added lines, -12 removed lines

@@ -14,19 +14,19 @@
  */
 class EventEditorAssetManager extends ReactAssetManager
 {
-    const DOMAIN = 'eventEditor';
+	const DOMAIN = 'eventEditor';
 
-    const ASSET_HANDLE_EVENT_EDITOR = Domain::ASSET_NAMESPACE . '-' . EventEditorAssetManager::DOMAIN;
+	const ASSET_HANDLE_EVENT_EDITOR = Domain::ASSET_NAMESPACE . '-' . EventEditorAssetManager::DOMAIN;
 
 
-    /**
-     * @throws DomainException
-     */
-    public function enqueueEventEditor()
-    {
-        if ($this->verifyAssetIsRegistered(EventEditorAssetManager::ASSET_HANDLE_EVENT_EDITOR)) {
-            wp_enqueue_script(EventEditorAssetManager::ASSET_HANDLE_EVENT_EDITOR);
-            wp_enqueue_style(EventEditorAssetManager::ASSET_HANDLE_EVENT_EDITOR);
-        }
-    }
+	/**
+	 * @throws DomainException
+	 */
+	public function enqueueEventEditor()
+	{
+		if ($this->verifyAssetIsRegistered(EventEditorAssetManager::ASSET_HANDLE_EVENT_EDITOR)) {
+			wp_enqueue_script(EventEditorAssetManager::ASSET_HANDLE_EVENT_EDITOR);
+			wp_enqueue_style(EventEditorAssetManager::ASSET_HANDLE_EVENT_EDITOR);
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 {
     const DOMAIN = 'eventEditor';
 
-    const ASSET_HANDLE_EVENT_EDITOR = Domain::ASSET_NAMESPACE . '-' . EventEditorAssetManager::DOMAIN;
+    const ASSET_HANDLE_EVENT_EDITOR = Domain::ASSET_NAMESPACE.'-'.EventEditorAssetManager::DOMAIN;
 
 
     /**

core/domain/services/assets/WordPressPluginsPageAssetManager.php

Indentation +12 added lines, -12 removed lines

@@ -15,18 +15,18 @@
  */
 class WordPressPluginsPageAssetManager extends ReactAssetManager
 {
-    const DOMAIN = 'wpPluginsPage';
+	const DOMAIN = 'wpPluginsPage';
 
-    const ASSET_HANDLE_WP_PLUGINS_PAGE = Domain::ASSET_NAMESPACE . '-' . WordPressPluginsPageAssetManager::DOMAIN;
+	const ASSET_HANDLE_WP_PLUGINS_PAGE = Domain::ASSET_NAMESPACE . '-' . WordPressPluginsPageAssetManager::DOMAIN;
 
-    /**
-     * @throws DomainException
-     */
-    public function enqueueAssets()
-    {
-        if ($this->verifyAssetIsRegistered(WordPressPluginsPageAssetManager::ASSET_HANDLE_WP_PLUGINS_PAGE)) {
-            wp_enqueue_script(WordPressPluginsPageAssetManager::ASSET_HANDLE_WP_PLUGINS_PAGE);
-            wp_enqueue_style(WordPressPluginsPageAssetManager::ASSET_HANDLE_WP_PLUGINS_PAGE);
-        }
-    }
+	/**
+	 * @throws DomainException
+	 */
+	public function enqueueAssets()
+	{
+		if ($this->verifyAssetIsRegistered(WordPressPluginsPageAssetManager::ASSET_HANDLE_WP_PLUGINS_PAGE)) {
+			wp_enqueue_script(WordPressPluginsPageAssetManager::ASSET_HANDLE_WP_PLUGINS_PAGE);
+			wp_enqueue_style(WordPressPluginsPageAssetManager::ASSET_HANDLE_WP_PLUGINS_PAGE);
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 {
     const DOMAIN = 'wpPluginsPage';
 
-    const ASSET_HANDLE_WP_PLUGINS_PAGE = Domain::ASSET_NAMESPACE . '-' . WordPressPluginsPageAssetManager::DOMAIN;
+    const ASSET_HANDLE_WP_PLUGINS_PAGE = Domain::ASSET_NAMESPACE.'-'.WordPressPluginsPageAssetManager::DOMAIN;
 
     /**
      * @throws DomainException

core/services/json/JsonConfig.php

Spacing +3 added lines, -3 removed lines

@@ -76,7 +76,7 @@ 
     {
         $setterOrGetter = $this->convertCase($property, $getter);
         // if not a getter, prepend with "set". ex: Show_expired => setShowExpired
-        $setterOrGetter = ! $getter ? 'set' . $setterOrGetter : $setterOrGetter;
+        $setterOrGetter = ! $getter ? 'set'.$setterOrGetter : $setterOrGetter;
         return $this->isValidMethod($setterOrGetter) ? $setterOrGetter : '';
     }
 
@@ -125,7 +125,7 @@ 
             }
             // convert to PascalCase and prepend with "set". ex: show_expired => setShowExpired
             $setter = $this->createGetterSetter($property, false);
-            $value  = array_key_exists($property, $config) ? $config[ $property ] : null;
+            $value  = array_key_exists($property, $config) ? $config[$property] : null;
             $this->{$setter}($value);
         }
     }
@@ -194,7 +194,7 @@ 
                 continue;
             }
             $getter = $this->createGetterSetter($property);
-            $config[ $property ] = $this->{$getter}();
+            $config[$property] = $this->{$getter}();
         }
         $config = wp_json_encode($config);
         if ($config_exists) {

Indentation +187 added lines, -187 removed lines

@@ -16,191 +16,191 @@
  */
 abstract class JsonConfig
 {
-    /**
-     * @var boolean $has_changes
-     */
-    private $has_changes = false;
-
-    /**
-     * @var string $option_name
-     */
-    private $option_name;
-
-
-    /**
-     * SettingsConfig constructor.
-     *
-     * @param array $defaults
-     */
-    public function __construct(array $defaults)
-    {
-        $this->setOptionName();
-        $this->load($defaults);
-        $this->clearChanges();
-    }
-
-
-    /**
-     * @return array
-     */
-    abstract protected function getProperties();
-
-
-    /**
-     * converts property name to:
-     *      camelCase for getters ex: show_expired => showExpired
-     *      PascalCase for setters ex: show_expired => ShowExpired
-     *
-     * @param string $string
-     * @param false  $camelCase
-     * @return string|string[]
-     * @since   5.0.0.p
-     */
-    private function convertCase($string, $camelCase = false)
-    {
-        $string = str_replace(' ', '', ucwords(str_replace('_', ' ', $string)));
-        if ($camelCase) {
-            $string = lcfirst($string);
-        }
-        return $string;
-    }
-
-
-    /**
-     * @param string $property
-     * @param bool   $getter
-     * @return string
-     */
-    private function createGetterSetter($property, $getter = true)
-    {
-        $setterOrGetter = $this->convertCase($property, $getter);
-        // if not a getter, prepend with "set". ex: Show_expired => setShowExpired
-        $setterOrGetter = ! $getter ? 'set' . $setterOrGetter : $setterOrGetter;
-        return $this->isValidMethod($setterOrGetter) ? $setterOrGetter : '';
-    }
-
-
-    /**
-     * @param string $method
-     * @return bool
-     * @throws DomainException
-     */
-    private function isValidMethod($method)
-    {
-        if (method_exists($this, $method)) {
-            return true;
-        }
-        throw new DomainException(
-            sprintf(
-                esc_html__('Missing %1$s method on JsonConfig class %2$s.', 'event_espresso'),
-                $method,
-                get_class($this)
-            )
-        );
-    }
-
-
-    /**
-     * converts class name to option name by changing backslashes to dashes
-     */
-    private function setOptionName()
-    {
-        $this->option_name = str_replace(['EventEspresso', '\\'], ['ee', '-'], get_class($this));
-    }
-
-
-    /**
-     * retrieves WP option for class, decodes the data, and resigns values to properties
-     *
-     * @param array $defaults
-     */
-    protected function load(array $defaults)
-    {
-        $config = get_option($this->option_name, '{}');
-        $config = (array) json_decode($config) + $defaults;
-        foreach ($this->getProperties() as $property => $value) {
-            if ($property === 'option_name') {
-                continue;
-            }
-            // convert to PascalCase and prepend with "set". ex: show_expired => setShowExpired
-            $setter = $this->createGetterSetter($property, false);
-            $value  = array_key_exists($property, $config) ? $config[ $property ] : null;
-            $this->{$setter}($value);
-        }
-    }
-
-
-    /**
-     * updates property value and marks changes if property value has changed
-     *
-     * @param string $property
-     * @param mixed  $value
-     */
-    protected function setProperty($property, $value)
-    {
-        $this->markChanges($this->{$property} === $value);
-        $this->{$property} = $value;
-    }
-
-
-    /**
-     * will only toggle has_changes to true otherwise keeps existing value (ie: will never toggle to false)
-     * why? this allows this method to be fed with the result of a conditional
-     * that compares an incoming value in a setter with it's previously set value.
-     * ie: if $x = 1 and you call setX(1) then the value has not really changed.
-     *
-     * @param bool $changes
-     * @since   5.0.0.p
-     */
-    protected function markChanges($changes = true)
-    {
-        $this->has_changes = filter_var($changes, FILTER_VALIDATE_BOOLEAN) ? true : $this->has_changes;
-    }
-
-
-    /**
-     * resets $has_changes flag to false but does NOT actually reset any data
-     */
-    public function clearChanges()
-    {
-        $this->has_changes = false;
-    }
-
-
-    /**
-     * flag for marking that changes have been made to property data
-     *
-     * @return bool
-     */
-    public function hasChanges()
-    {
-        return $this->has_changes;
-    }
-
-
-    /**
-     * encodes all property data to JSON and saves it to a WP option
-     */
-    public function update()
-    {
-        $config_exists = get_option($this->option_name);
-        if ($config_exists && ! $this->has_changes) {
-            return;
-        }
-        $config = [];
-        foreach ($this->getProperties() as $property => $value) {
-            if ($property === 'option_name') {
-                continue;
-            }
-            $getter = $this->createGetterSetter($property);
-            $config[ $property ] = $this->{$getter}();
-        }
-        $config = wp_json_encode($config);
-        if ($config_exists) {
-            update_option($this->option_name, $config);
-        } else {
-            add_option($this->option_name, $config, '', 'no');
-        }
-        $this->clearChanges();
-    }
+	/**
+	 * @var boolean $has_changes
+	 */
+	private $has_changes = false;
+
+	/**
+	 * @var string $option_name
+	 */
+	private $option_name;
+
+
+	/**
+	 * SettingsConfig constructor.
+	 *
+	 * @param array $defaults
+	 */
+	public function __construct(array $defaults)
+	{
+		$this->setOptionName();
+		$this->load($defaults);
+		$this->clearChanges();
+	}
+
+
+	/**
+	 * @return array
+	 */
+	abstract protected function getProperties();
+
+
+	/**
+	 * converts property name to:
+	 *      camelCase for getters ex: show_expired => showExpired
+	 *      PascalCase for setters ex: show_expired => ShowExpired
+	 *
+	 * @param string $string
+	 * @param false  $camelCase
+	 * @return string|string[]
+	 * @since   5.0.0.p
+	 */
+	private function convertCase($string, $camelCase = false)
+	{
+		$string = str_replace(' ', '', ucwords(str_replace('_', ' ', $string)));
+		if ($camelCase) {
+			$string = lcfirst($string);
+		}
+		return $string;
+	}
+
+
+	/**
+	 * @param string $property
+	 * @param bool   $getter
+	 * @return string
+	 */
+	private function createGetterSetter($property, $getter = true)
+	{
+		$setterOrGetter = $this->convertCase($property, $getter);
+		// if not a getter, prepend with "set". ex: Show_expired => setShowExpired
+		$setterOrGetter = ! $getter ? 'set' . $setterOrGetter : $setterOrGetter;
+		return $this->isValidMethod($setterOrGetter) ? $setterOrGetter : '';
+	}
+
+
+	/**
+	 * @param string $method
+	 * @return bool
+	 * @throws DomainException
+	 */
+	private function isValidMethod($method)
+	{
+		if (method_exists($this, $method)) {
+			return true;
+		}
+		throw new DomainException(
+			sprintf(
+				esc_html__('Missing %1$s method on JsonConfig class %2$s.', 'event_espresso'),
+				$method,
+				get_class($this)
+			)
+		);
+	}
+
+
+	/**
+	 * converts class name to option name by changing backslashes to dashes
+	 */
+	private function setOptionName()
+	{
+		$this->option_name = str_replace(['EventEspresso', '\\'], ['ee', '-'], get_class($this));
+	}
+
+
+	/**
+	 * retrieves WP option for class, decodes the data, and resigns values to properties
+	 *
+	 * @param array $defaults
+	 */
+	protected function load(array $defaults)
+	{
+		$config = get_option($this->option_name, '{}');
+		$config = (array) json_decode($config) + $defaults;
+		foreach ($this->getProperties() as $property => $value) {
+			if ($property === 'option_name') {
+				continue;
+			}
+			// convert to PascalCase and prepend with "set". ex: show_expired => setShowExpired
+			$setter = $this->createGetterSetter($property, false);
+			$value  = array_key_exists($property, $config) ? $config[ $property ] : null;
+			$this->{$setter}($value);
+		}
+	}
+
+
+	/**
+	 * updates property value and marks changes if property value has changed
+	 *
+	 * @param string $property
+	 * @param mixed  $value
+	 */
+	protected function setProperty($property, $value)
+	{
+		$this->markChanges($this->{$property} === $value);
+		$this->{$property} = $value;
+	}
+
+
+	/**
+	 * will only toggle has_changes to true otherwise keeps existing value (ie: will never toggle to false)
+	 * why? this allows this method to be fed with the result of a conditional
+	 * that compares an incoming value in a setter with it's previously set value.
+	 * ie: if $x = 1 and you call setX(1) then the value has not really changed.
+	 *
+	 * @param bool $changes
+	 * @since   5.0.0.p
+	 */
+	protected function markChanges($changes = true)
+	{
+		$this->has_changes = filter_var($changes, FILTER_VALIDATE_BOOLEAN) ? true : $this->has_changes;
+	}
+
+
+	/**
+	 * resets $has_changes flag to false but does NOT actually reset any data
+	 */
+	public function clearChanges()
+	{
+		$this->has_changes = false;
+	}
+
+
+	/**
+	 * flag for marking that changes have been made to property data
+	 *
+	 * @return bool
+	 */
+	public function hasChanges()
+	{
+		return $this->has_changes;
+	}
+
+
+	/**
+	 * encodes all property data to JSON and saves it to a WP option
+	 */
+	public function update()
+	{
+		$config_exists = get_option($this->option_name);
+		if ($config_exists && ! $this->has_changes) {
+			return;
+		}
+		$config = [];
+		foreach ($this->getProperties() as $property => $value) {
+			if ($property === 'option_name') {
+				continue;
+			}
+			$getter = $this->createGetterSetter($property);
+			$config[ $property ] = $this->{$getter}();
+		}
+		$config = wp_json_encode($config);
+		if ($config_exists) {
+			update_option($this->option_name, $config);
+		} else {
+			add_option($this->option_name, $config, '', 'no');
+		}
+		$this->clearChanges();
+	}
 }

core/domain/entities/routing/data_nodes/core/Capabilities.php

Indentation +24 added lines, -24 removed lines

@@ -7,32 +7,32 @@
 
 class Capabilities extends JsonDataNode
 {
-    const NODE_NAME = 'capabilities';
+	const NODE_NAME = 'capabilities';
 
 
-    /**
-     * @param JsonDataNodeValidator $validator
-     */
-    public function __construct(JsonDataNodeValidator $validator)
-    {
-        parent::__construct($validator);
-        $this->setNodeName(Capabilities::NODE_NAME);
-    }
+	/**
+	 * @param JsonDataNodeValidator $validator
+	 */
+	public function __construct(JsonDataNodeValidator $validator)
+	{
+		parent::__construct($validator);
+		$this->setNodeName(Capabilities::NODE_NAME);
+	}
 
 
-    /**
-     * @inheritDoc
-     */
-    public function initialize()
-    {
-        $current_user      = wp_get_current_user();
-        $capabilities      = [];
-        $role_capabilities = $current_user->get_role_caps();
-        foreach ($role_capabilities as $capability => $you_can_do_it) {
-            if ($you_can_do_it) {
-                $capabilities[] = $capability;
-            }
-        }
-        $this->setDataArray($capabilities);
-    }
+	/**
+	 * @inheritDoc
+	 */
+	public function initialize()
+	{
+		$current_user      = wp_get_current_user();
+		$capabilities      = [];
+		$role_capabilities = $current_user->get_role_caps();
+		foreach ($role_capabilities as $capability => $you_can_do_it) {
+			if ($you_can_do_it) {
+				$capabilities[] = $capability;
+			}
+		}
+		$this->setDataArray($capabilities);
+	}
 }

core/services/json/JsonDataNodeValidator.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
     public function dataArrayEmpty(JsonDataNode $data_node)
     {
         $data = $data_node->data();
-        if (! empty($data)) {
+        if ( ! empty($data)) {
             $this->overwriteError($data_node->nodeName(), esc_html__('data array', 'event_espresso'));
             return false;
         }
@@ -38,7 +38,7 @@ 
      */
     public function propertyNotSet(array $data, $key, $type = 'key')
     {
-        if (isset($data[ $key ])) {
+        if (isset($data[$key])) {
             $this->overwriteError($key, $type);
             return false;
         }

Indentation +76 added lines, -76 removed lines

@@ -13,91 +13,91 @@
  */
 class JsonDataNodeValidator
 {
-    /**
-     * @param JsonDataNode $data_node
-     * @return bool             returns true if data array is safe to set, false if overwrite will occur
-     * @throws DomainException  throws exception if WP_DEBUG is true
-     */
-    public function dataArrayEmpty(JsonDataNode $data_node)
-    {
-        $data = $data_node->data();
-        if (! empty($data)) {
-            $this->overwriteError($data_node->nodeName(), esc_html__('data array', 'event_espresso'));
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * @param JsonDataNode $data_node
+	 * @return bool             returns true if data array is safe to set, false if overwrite will occur
+	 * @throws DomainException  throws exception if WP_DEBUG is true
+	 */
+	public function dataArrayEmpty(JsonDataNode $data_node)
+	{
+		$data = $data_node->data();
+		if (! empty($data)) {
+			$this->overwriteError($data_node->nodeName(), esc_html__('data array', 'event_espresso'));
+			return false;
+		}
+		return true;
+	}
 
-    /**
-     * @param array  $data      data array to check for property key
-     * @param string $key       value for the key being checked for
-     * @param string $type      the type of key and/or the data being checked
-     * @return bool             returns true if property is safe to write, false if overwrite will occur
-     * @throws DomainException  throws exception if WP_DEBUG is true
-     */
-    public function propertyNotSet(array $data, $key, $type = 'key')
-    {
-        if (isset($data[ $key ])) {
-            $this->overwriteError($key, $type);
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * @param array  $data      data array to check for property key
+	 * @param string $key       value for the key being checked for
+	 * @param string $type      the type of key and/or the data being checked
+	 * @return bool             returns true if property is safe to write, false if overwrite will occur
+	 * @throws DomainException  throws exception if WP_DEBUG is true
+	 */
+	public function propertyNotSet(array $data, $key, $type = 'key')
+	{
+		if (isset($data[ $key ])) {
+			$this->overwriteError($key, $type);
+			return false;
+		}
+		return true;
+	}
 
 
-    /**
-     * @param string $key       value for the key being checked for
-     * @param string $type      the type of key and/or the data being checked
-     * @throws DomainException  throws exception if WP_DEBUG is true
-     */
-    public function overwriteError($key, $type)
-    {
-        if (WP_DEBUG) {
-            throw new DomainException(
-                sprintf(
-                    /*
+	/**
+	 * @param string $key       value for the key being checked for
+	 * @param string $type      the type of key and/or the data being checked
+	 * @throws DomainException  throws exception if WP_DEBUG is true
+	 */
+	public function overwriteError($key, $type)
+	{
+		if (WP_DEBUG) {
+			throw new DomainException(
+				sprintf(
+					/*
                      * translators:
                      * 'The "i18n" JsonDataNode key is already set and would be overwritten by the current action.'
                      */
-                    esc_html__(
-                        'The "%1$s" JsonDataNode %2$s is already set and would be overwritten by the current action.',
-                        'event_espresso'
-                    ),
-                    $key,
-                    $type
-                )
-            );
-        }
-    }
+					esc_html__(
+						'The "%1$s" JsonDataNode %2$s is already set and would be overwritten by the current action.',
+						'event_espresso'
+					),
+					$key,
+					$type
+				)
+			);
+		}
+	}
 
 
-    /**
-     * @param string $property  name for the key being checked for
-     * @param string $type      the type of key and/or the data being checked
-     * @param bool   $throw     if true [default] and WP_DEBUG is also true, then will throw exceptions
-     * @return bool             returns true if property is set, false if property is missing
-     * @throws DomainException  throws exception if WP_DEBUG is true
-     */
-    public function validateCriticalProperty($property, $type, $throw = true)
-    {
-        if (empty($property)) {
-            if (WP_DEBUG && $throw) {
-                throw new DomainException(
-                    sprintf(
-                        /*
+	/**
+	 * @param string $property  name for the key being checked for
+	 * @param string $type      the type of key and/or the data being checked
+	 * @param bool   $throw     if true [default] and WP_DEBUG is also true, then will throw exceptions
+	 * @return bool             returns true if property is set, false if property is missing
+	 * @throws DomainException  throws exception if WP_DEBUG is true
+	 */
+	public function validateCriticalProperty($property, $type, $throw = true)
+	{
+		if (empty($property)) {
+			if (WP_DEBUG && $throw) {
+				throw new DomainException(
+					sprintf(
+						/*
                          * translators:
                          * 'The JsonDataNodeHandler domain route is a required property but has not been set.'
                          */
-                        esc_html__(
-                            'The JsonDataNodeHandler %1$s is a required property but has not been set.',
-                            'event_espresso'
-                        ),
-                        $type
-                    )
-                );
-            }
-            return false;
-        }
-        return true;
-    }
+						esc_html__(
+							'The JsonDataNodeHandler %1$s is a required property but has not been set.',
+							'event_espresso'
+						),
+						$type
+					)
+				);
+			}
+			return false;
+		}
+		return true;
+	}
 }