pryley / site-reviews

plugin/Modules/Translation.php

Braces +6 added lines, -3 removed lines

@@ -73,7 +73,8 @@ 
             foreach ($potEntries as $key => $entry) {
                 $entries[html_entity_decode($key, ENT_COMPAT, 'UTF-8')] = $entry;
             }
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             glsr_log()->error($e->getMessage());
         }
         return $entries;
@@ -196,7 +197,8 @@ 
                 if (in_array($needle, [$single, $plural])) {
                     $this->results[$key] = $entry;
                 }
-            } elseif (false !== strpos(sprintf('%s %s', $single, $plural), $needle)) {
+            }
+            elseif (false !== strpos(sprintf('%s %s', $single, $plural), $needle)) {
                 $this->results[$key] = $entry;
             }
         }
@@ -242,7 +244,8 @@ 
             foreach ($keys as $key) {
                 try {
                     $entry = $this->normalizeEntryString($entry, $key);
-                } catch (\TypeError $error) {
+                }
+                catch (\TypeError $error) {
                     glsr_log()->once('error', 'Translation/normalize', $error);
                     glsr_log()->once('debug', 'Translation/normalize', $entry);
                 }

Indentation +250 added lines, -250 removed lines

@@ -10,272 +10,272 @@
 
 class Translation
 {
-    const SEARCH_THRESHOLD = 3;
+	const SEARCH_THRESHOLD = 3;
 
-    /**
-     * @var array
-     */
-    protected $entries;
+	/**
+	 * @var array
+	 */
+	protected $entries;
 
-    /**
-     * @var array
-     */
-    protected $results;
+	/**
+	 * @var array
+	 */
+	protected $results;
 
-    /**
-     * Returns all saved custom translations with translation context.
-     * @return array
-     */
-    public function all()
-    {
-        $translations = $this->translations();
-        $entries = $this->filter($translations, $this->entries())->results();
-        array_walk($translations, function (&$entry) use ($entries) {
-            $entry['desc'] = array_key_exists($entry['id'], $entries)
-                ? $this->getEntryString($entries[$entry['id']], 'msgctxt')
-                : '';
-        });
-        return $translations;
-    }
+	/**
+	 * Returns all saved custom translations with translation context.
+	 * @return array
+	 */
+	public function all()
+	{
+		$translations = $this->translations();
+		$entries = $this->filter($translations, $this->entries())->results();
+		array_walk($translations, function (&$entry) use ($entries) {
+			$entry['desc'] = array_key_exists($entry['id'], $entries)
+				? $this->getEntryString($entries[$entry['id']], 'msgctxt')
+				: '';
+		});
+		return $translations;
+	}
 
-    /**
-     * @return array
-     */
-    public function entries()
-    {
-        if (!isset($this->entries)) {
-            $potFile = glsr()->path(glsr()->languages.'/'.Application::ID.'.pot');
-            $entries = $this->extractEntriesFromPotFile($potFile);
-            $entries = apply_filters('site-reviews/translation/entries', $entries);
-            $this->entries = $entries;
-        }
-        return $this->entries;
-    }
+	/**
+	 * @return array
+	 */
+	public function entries()
+	{
+		if (!isset($this->entries)) {
+			$potFile = glsr()->path(glsr()->languages.'/'.Application::ID.'.pot');
+			$entries = $this->extractEntriesFromPotFile($potFile);
+			$entries = apply_filters('site-reviews/translation/entries', $entries);
+			$this->entries = $entries;
+		}
+		return $this->entries;
+	}
 
-    /**
-     * @param array|null $entriesToExclude
-     * @param array|null $entries
-     * @return static
-     */
-    public function exclude($entriesToExclude = null, $entries = null)
-    {
-        return $this->filter($entriesToExclude, $entries, false);
-    }
+	/**
+	 * @param array|null $entriesToExclude
+	 * @param array|null $entries
+	 * @return static
+	 */
+	public function exclude($entriesToExclude = null, $entries = null)
+	{
+		return $this->filter($entriesToExclude, $entries, false);
+	}
 
-    /**
-     * @param string $potFile
-     * @return array
-     */
-    public function extractEntriesFromPotFile($potFile, array $entries = [])
-    {
-        try {
-            $potEntries = $this->normalize(Parser::parseFile($potFile)->getEntries());
-            foreach ($potEntries as $key => $entry) {
-                $entries[html_entity_decode($key, ENT_COMPAT, 'UTF-8')] = $entry;
-            }
-        } catch (Exception $e) {
-            glsr_log()->error($e->getMessage());
-        }
-        return $entries;
-    }
+	/**
+	 * @param string $potFile
+	 * @return array
+	 */
+	public function extractEntriesFromPotFile($potFile, array $entries = [])
+	{
+		try {
+			$potEntries = $this->normalize(Parser::parseFile($potFile)->getEntries());
+			foreach ($potEntries as $key => $entry) {
+				$entries[html_entity_decode($key, ENT_COMPAT, 'UTF-8')] = $entry;
+			}
+		} catch (Exception $e) {
+			glsr_log()->error($e->getMessage());
+		}
+		return $entries;
+	}
 
-    /**
-     * @param array|null $filterWith
-     * @param array|null $entries
-     * @param bool $intersect
-     * @return static
-     */
-    public function filter($filterWith = null, $entries = null, $intersect = true)
-    {
-        if (!is_array($entries)) {
-            $entries = $this->results;
-        }
-        if (!is_array($filterWith)) {
-            $filterWith = $this->translations();
-        }
-        $keys = array_flip(glsr_array_column($filterWith, 'id'));
-        $this->results = $intersect
-            ? array_intersect_key($entries, $keys)
-            : array_diff_key($entries, $keys);
-        return $this;
-    }
+	/**
+	 * @param array|null $filterWith
+	 * @param array|null $entries
+	 * @param bool $intersect
+	 * @return static
+	 */
+	public function filter($filterWith = null, $entries = null, $intersect = true)
+	{
+		if (!is_array($entries)) {
+			$entries = $this->results;
+		}
+		if (!is_array($filterWith)) {
+			$filterWith = $this->translations();
+		}
+		$keys = array_flip(glsr_array_column($filterWith, 'id'));
+		$this->results = $intersect
+			? array_intersect_key($entries, $keys)
+			: array_diff_key($entries, $keys);
+		return $this;
+	}
 
-    /**
-     * @param string $template
-     * @return string
-     */
-    public function render($template, array $entry)
-    {
-        $data = array_combine(
-            array_map(function ($key) { return 'data.'.$key; }, array_keys($entry)),
-            $entry
-        );
-        $data['data.class'] = $data['data.error'] = '';
-        if (false === array_search($entry['s1'], glsr_array_column($this->entries(), 'msgid'))) {
-            $data['data.class'] = 'is-invalid';
-            $data['data.error'] = __('This custom translation is no longer valid as the original text has been changed or removed.', 'site-reviews');
-        }
-        return glsr(Template::class)->build('partials/translations/'.$template, [
-            'context' => $data,
-        ]);
-    }
+	/**
+	 * @param string $template
+	 * @return string
+	 */
+	public function render($template, array $entry)
+	{
+		$data = array_combine(
+			array_map(function ($key) { return 'data.'.$key; }, array_keys($entry)),
+			$entry
+		);
+		$data['data.class'] = $data['data.error'] = '';
+		if (false === array_search($entry['s1'], glsr_array_column($this->entries(), 'msgid'))) {
+			$data['data.class'] = 'is-invalid';
+			$data['data.error'] = __('This custom translation is no longer valid as the original text has been changed or removed.', 'site-reviews');
+		}
+		return glsr(Template::class)->build('partials/translations/'.$template, [
+			'context' => $data,
+		]);
+	}
 
-    /**
-     * Returns a rendered string of all saved custom translations with translation context.
-     * @return string
-     */
-    public function renderAll()
-    {
-        $rendered = '';
-        foreach ($this->all() as $index => $entry) {
-            $entry['index'] = $index;
-            $entry['prefix'] = OptionManager::databaseKey();
-            $rendered.= $this->render($entry['type'], $entry);
-        }
-        return $rendered;
-    }
+	/**
+	 * Returns a rendered string of all saved custom translations with translation context.
+	 * @return string
+	 */
+	public function renderAll()
+	{
+		$rendered = '';
+		foreach ($this->all() as $index => $entry) {
+			$entry['index'] = $index;
+			$entry['prefix'] = OptionManager::databaseKey();
+			$rendered.= $this->render($entry['type'], $entry);
+		}
+		return $rendered;
+	}
 
-    /**
-     * @param bool $resetAfterRender
-     * @return string
-     */
-    public function renderResults($resetAfterRender = true)
-    {
-        $rendered = '';
-        foreach ($this->results as $id => $entry) {
-            $data = [
-                'desc' => $this->getEntryString($entry, 'msgctxt'),
-                'id' => $id,
-                'p1' => $this->getEntryString($entry, 'msgid_plural'),
-                's1' => $this->getEntryString($entry, 'msgid'),
-            ];
-            $text = !empty($data['p1'])
-                ? sprintf('%s | %s', $data['s1'], $data['p1'])
-                : $data['s1'];
-            $rendered.= $this->render('result', [
-                'entry' => json_encode($data, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE),
-                'text' => wp_strip_all_tags($text),
-            ]);
-        }
-        if ($resetAfterRender) {
-            $this->reset();
-        }
-        return $rendered;
-    }
+	/**
+	 * @param bool $resetAfterRender
+	 * @return string
+	 */
+	public function renderResults($resetAfterRender = true)
+	{
+		$rendered = '';
+		foreach ($this->results as $id => $entry) {
+			$data = [
+				'desc' => $this->getEntryString($entry, 'msgctxt'),
+				'id' => $id,
+				'p1' => $this->getEntryString($entry, 'msgid_plural'),
+				's1' => $this->getEntryString($entry, 'msgid'),
+			];
+			$text = !empty($data['p1'])
+				? sprintf('%s | %s', $data['s1'], $data['p1'])
+				: $data['s1'];
+			$rendered.= $this->render('result', [
+				'entry' => json_encode($data, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE),
+				'text' => wp_strip_all_tags($text),
+			]);
+		}
+		if ($resetAfterRender) {
+			$this->reset();
+		}
+		return $rendered;
+	}
 
-    /**
-     * @return void
-     */
-    public function reset()
-    {
-        $this->results = [];
-    }
+	/**
+	 * @return void
+	 */
+	public function reset()
+	{
+		$this->results = [];
+	}
 
-    /**
-     * @return array
-     */
-    public function results()
-    {
-        $results = $this->results;
-        $this->reset();
-        return $results;
-    }
+	/**
+	 * @return array
+	 */
+	public function results()
+	{
+		$results = $this->results;
+		$this->reset();
+		return $results;
+	}
 
-    /**
-     * @param string $needle
-     * @return static
-     */
-    public function search($needle = '')
-    {
-        $this->reset();
-        $needle = trim(strtolower($needle));
-        foreach ($this->entries() as $key => $entry) {
-            $single = strtolower($this->getEntryString($entry, 'msgid'));
-            $plural = strtolower($this->getEntryString($entry, 'msgid_plural'));
-            if (strlen($needle) < static::SEARCH_THRESHOLD) {
-                if (in_array($needle, [$single, $plural])) {
-                    $this->results[$key] = $entry;
-                }
-            } elseif (false !== strpos(sprintf('%s %s', $single, $plural), $needle)) {
-                $this->results[$key] = $entry;
-            }
-        }
-        return $this;
-    }
+	/**
+	 * @param string $needle
+	 * @return static
+	 */
+	public function search($needle = '')
+	{
+		$this->reset();
+		$needle = trim(strtolower($needle));
+		foreach ($this->entries() as $key => $entry) {
+			$single = strtolower($this->getEntryString($entry, 'msgid'));
+			$plural = strtolower($this->getEntryString($entry, 'msgid_plural'));
+			if (strlen($needle) < static::SEARCH_THRESHOLD) {
+				if (in_array($needle, [$single, $plural])) {
+					$this->results[$key] = $entry;
+				}
+			} elseif (false !== strpos(sprintf('%s %s', $single, $plural), $needle)) {
+				$this->results[$key] = $entry;
+			}
+		}
+		return $this;
+	}
 
-    /**
-     * Store the translations to avoid unnecessary loops.
-     * @return array
-     */
-    public function translations()
-    {
-        static $translations;
-        if (empty($translations)) {
-            $settings = glsr(OptionManager::class)->get('settings');
-            $translations = isset($settings['strings'])
-                ? $this->normalizeSettings((array) $settings['strings'])
-                : [];
-        }
-        return $translations;
-    }
+	/**
+	 * Store the translations to avoid unnecessary loops.
+	 * @return array
+	 */
+	public function translations()
+	{
+		static $translations;
+		if (empty($translations)) {
+			$settings = glsr(OptionManager::class)->get('settings');
+			$translations = isset($settings['strings'])
+				? $this->normalizeSettings((array) $settings['strings'])
+				: [];
+		}
+		return $translations;
+	}
 
-    /**
-     * @param string $key
-     * @return string
-     */
-    protected function getEntryString(array $entry, $key)
-    {
-        return isset($entry[$key])
-            ? implode('', (array) $entry[$key])
-            : '';
-    }
+	/**
+	 * @param string $key
+	 * @return string
+	 */
+	protected function getEntryString(array $entry, $key)
+	{
+		return isset($entry[$key])
+			? implode('', (array) $entry[$key])
+			: '';
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalize(array $entries)
-    {
-        $keys = [
-            'msgctxt', 'msgid', 'msgid_plural', 'msgstr', 'msgstr[0]', 'msgstr[1]',
-        ];
-        array_walk($entries, function (&$entry) use ($keys) {
-            foreach ($keys as $key) {
-                try {
-                    $entry = $this->normalizeEntryString($entry, $key);
-                } catch (\TypeError $error) {
-                    glsr_log()->once('error', 'Translation/normalize', $error);
-                    glsr_log()->once('debug', 'Translation/normalize', $entry);
-                }
-            }
-        });
-        return $entries;
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalize(array $entries)
+	{
+		$keys = [
+			'msgctxt', 'msgid', 'msgid_plural', 'msgstr', 'msgstr[0]', 'msgstr[1]',
+		];
+		array_walk($entries, function (&$entry) use ($keys) {
+			foreach ($keys as $key) {
+				try {
+					$entry = $this->normalizeEntryString($entry, $key);
+				} catch (\TypeError $error) {
+					glsr_log()->once('error', 'Translation/normalize', $error);
+					glsr_log()->once('debug', 'Translation/normalize', $entry);
+				}
+			}
+		});
+		return $entries;
+	}
 
-    /**
-     * @param string $key
-     * @return array
-     */
-    protected function normalizeEntryString(array $entry, $key)
-    {
-        if (isset($entry[$key])) {
-            $entry[$key] = $this->getEntryString($entry, $key);
-        }
-        return $entry;
-    }
+	/**
+	 * @param string $key
+	 * @return array
+	 */
+	protected function normalizeEntryString(array $entry, $key)
+	{
+		if (isset($entry[$key])) {
+			$entry[$key] = $this->getEntryString($entry, $key);
+		}
+		return $entry;
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalizeSettings(array $strings)
-    {
-        $defaultString = array_fill_keys(['id', 's1', 's2', 'p1', 'p2'], '');
-        $strings = array_filter($strings, 'is_array');
-        foreach ($strings as &$string) {
-            $string['type'] = isset($string['p1']) ? 'plural' : 'single';
-            $string = wp_parse_args($string, $defaultString);
-        }
-        return array_filter($strings, function ($string) {
-            return !empty($string['id']);
-        });
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalizeSettings(array $strings)
+	{
+		$defaultString = array_fill_keys(['id', 's1', 's2', 'p1', 'p2'], '');
+		$strings = array_filter($strings, 'is_array');
+		foreach ($strings as &$string) {
+			$string['type'] = isset($string['p1']) ? 'plural' : 'single';
+			$string = wp_parse_args($string, $defaultString);
+		}
+		return array_filter($strings, function ($string) {
+			return !empty($string['id']);
+		});
+	}
 }

Spacing +70 added lines, -70 removed lines

@@ -29,10 +29,10 @@ 
     public function all()
     {
         $translations = $this->translations();
-        $entries = $this->filter($translations, $this->entries())->results();
-        array_walk($translations, function (&$entry) use ($entries) {
-            $entry['desc'] = array_key_exists($entry['id'], $entries)
-                ? $this->getEntryString($entries[$entry['id']], 'msgctxt')
+        $entries = $this->filter( $translations, $this->entries() )->results();
+        array_walk( $translations, function( &$entry ) use ($entries) {
+            $entry['desc'] = array_key_exists( $entry['id'], $entries )
+                ? $this->getEntryString( $entries[$entry['id']], 'msgctxt' )
                 : '';
         });
         return $translations;
@@ -43,10 +43,10 @@ 
      */
     public function entries()
     {
-        if (!isset($this->entries)) {
-            $potFile = glsr()->path(glsr()->languages.'/'.Application::ID.'.pot');
-            $entries = $this->extractEntriesFromPotFile($potFile);
-            $entries = apply_filters('site-reviews/translation/entries', $entries);
+        if( !isset($this->entries) ) {
+            $potFile = glsr()->path( glsr()->languages.'/'.Application::ID.'.pot' );
+            $entries = $this->extractEntriesFromPotFile( $potFile );
+            $entries = apply_filters( 'site-reviews/translation/entries', $entries );
             $this->entries = $entries;
         }
         return $this->entries;
@@ -57,24 +57,24 @@ 
      * @param array|null $entries
      * @return static
      */
-    public function exclude($entriesToExclude = null, $entries = null)
+    public function exclude( $entriesToExclude = null, $entries = null )
     {
-        return $this->filter($entriesToExclude, $entries, false);
+        return $this->filter( $entriesToExclude, $entries, false );
     }
 
     /**
      * @param string $potFile
      * @return array
      */
-    public function extractEntriesFromPotFile($potFile, array $entries = [])
+    public function extractEntriesFromPotFile( $potFile, array $entries = [] )
     {
         try {
-            $potEntries = $this->normalize(Parser::parseFile($potFile)->getEntries());
-            foreach ($potEntries as $key => $entry) {
-                $entries[html_entity_decode($key, ENT_COMPAT, 'UTF-8')] = $entry;
+            $potEntries = $this->normalize( Parser::parseFile( $potFile )->getEntries() );
+            foreach( $potEntries as $key => $entry ) {
+                $entries[html_entity_decode( $key, ENT_COMPAT, 'UTF-8' )] = $entry;
             }
-        } catch (Exception $e) {
-            glsr_log()->error($e->getMessage());
+        } catch( Exception $e ) {
+            glsr_log()->error( $e->getMessage() );
         }
         return $entries;
     }
@@ -85,18 +85,18 @@ 
      * @param bool $intersect
      * @return static
      */
-    public function filter($filterWith = null, $entries = null, $intersect = true)
+    public function filter( $filterWith = null, $entries = null, $intersect = true )
     {
-        if (!is_array($entries)) {
+        if( !is_array( $entries ) ) {
             $entries = $this->results;
         }
-        if (!is_array($filterWith)) {
+        if( !is_array( $filterWith ) ) {
             $filterWith = $this->translations();
         }
-        $keys = array_flip(glsr_array_column($filterWith, 'id'));
+        $keys = array_flip( glsr_array_column( $filterWith, 'id' ) );
         $this->results = $intersect
-            ? array_intersect_key($entries, $keys)
-            : array_diff_key($entries, $keys);
+            ? array_intersect_key( $entries, $keys )
+            : array_diff_key( $entries, $keys );
         return $this;
     }
 
@@ -104,20 +104,20 @@ 
      * @param string $template
      * @return string
      */
-    public function render($template, array $entry)
+    public function render( $template, array $entry )
     {
         $data = array_combine(
-            array_map(function ($key) { return 'data.'.$key; }, array_keys($entry)),
+            array_map( function( $key ) { return 'data.'.$key; }, array_keys( $entry ) ),
             $entry
         );
         $data['data.class'] = $data['data.error'] = '';
-        if (false === array_search($entry['s1'], glsr_array_column($this->entries(), 'msgid'))) {
+        if( false === array_search( $entry['s1'], glsr_array_column( $this->entries(), 'msgid' ) ) ) {
             $data['data.class'] = 'is-invalid';
-            $data['data.error'] = __('This custom translation is no longer valid as the original text has been changed or removed.', 'site-reviews');
+            $data['data.error'] = __( 'This custom translation is no longer valid as the original text has been changed or removed.', 'site-reviews' );
         }
-        return glsr(Template::class)->build('partials/translations/'.$template, [
+        return glsr( Template::class )->build( 'partials/translations/'.$template, [
             'context' => $data,
-        ]);
+        ] );
     }
 
     /**
@@ -127,10 +127,10 @@ 
     public function renderAll()
     {
         $rendered = '';
-        foreach ($this->all() as $index => $entry) {
+        foreach( $this->all() as $index => $entry ) {
             $entry['index'] = $index;
             $entry['prefix'] = OptionManager::databaseKey();
-            $rendered.= $this->render($entry['type'], $entry);
+            $rendered .= $this->render( $entry['type'], $entry );
         }
         return $rendered;
     }
@@ -139,25 +139,25 @@ 
      * @param bool $resetAfterRender
      * @return string
      */
-    public function renderResults($resetAfterRender = true)
+    public function renderResults( $resetAfterRender = true )
     {
         $rendered = '';
-        foreach ($this->results as $id => $entry) {
+        foreach( $this->results as $id => $entry ) {
             $data = [
-                'desc' => $this->getEntryString($entry, 'msgctxt'),
+                'desc' => $this->getEntryString( $entry, 'msgctxt' ),
                 'id' => $id,
-                'p1' => $this->getEntryString($entry, 'msgid_plural'),
-                's1' => $this->getEntryString($entry, 'msgid'),
+                'p1' => $this->getEntryString( $entry, 'msgid_plural' ),
+                's1' => $this->getEntryString( $entry, 'msgid' ),
             ];
             $text = !empty($data['p1'])
-                ? sprintf('%s | %s', $data['s1'], $data['p1'])
+                ? sprintf( '%s | %s', $data['s1'], $data['p1'] )
                 : $data['s1'];
-            $rendered.= $this->render('result', [
-                'entry' => json_encode($data, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE),
-                'text' => wp_strip_all_tags($text),
-            ]);
+            $rendered .= $this->render( 'result', [
+                'entry' => json_encode( $data, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ),
+                'text' => wp_strip_all_tags( $text ),
+            ] );
         }
-        if ($resetAfterRender) {
+        if( $resetAfterRender ) {
             $this->reset();
         }
         return $rendered;
@@ -185,18 +185,18 @@ 
      * @param string $needle
      * @return static
      */
-    public function search($needle = '')
+    public function search( $needle = '' )
     {
         $this->reset();
-        $needle = trim(strtolower($needle));
-        foreach ($this->entries() as $key => $entry) {
-            $single = strtolower($this->getEntryString($entry, 'msgid'));
-            $plural = strtolower($this->getEntryString($entry, 'msgid_plural'));
-            if (strlen($needle) < static::SEARCH_THRESHOLD) {
-                if (in_array($needle, [$single, $plural])) {
+        $needle = trim( strtolower( $needle ) );
+        foreach( $this->entries() as $key => $entry ) {
+            $single = strtolower( $this->getEntryString( $entry, 'msgid' ) );
+            $plural = strtolower( $this->getEntryString( $entry, 'msgid_plural' ) );
+            if( strlen( $needle ) < static::SEARCH_THRESHOLD ) {
+                if( in_array( $needle, [$single, $plural] ) ) {
                     $this->results[$key] = $entry;
                 }
-            } elseif (false !== strpos(sprintf('%s %s', $single, $plural), $needle)) {
+            } elseif( false !== strpos( sprintf( '%s %s', $single, $plural ), $needle ) ) {
                 $this->results[$key] = $entry;
             }
         }
@@ -210,10 +210,10 @@ 
     public function translations()
     {
         static $translations;
-        if (empty($translations)) {
-            $settings = glsr(OptionManager::class)->get('settings');
+        if( empty($translations) ) {
+            $settings = glsr( OptionManager::class )->get( 'settings' );
             $translations = isset($settings['strings'])
-                ? $this->normalizeSettings((array) $settings['strings'])
+                ? $this->normalizeSettings( (array)$settings['strings'] )
                 : [];
         }
         return $translations;
@@ -223,28 +223,28 @@ 
      * @param string $key
      * @return string
      */
-    protected function getEntryString(array $entry, $key)
+    protected function getEntryString( array $entry, $key )
     {
         return isset($entry[$key])
-            ? implode('', (array) $entry[$key])
+            ? implode( '', (array)$entry[$key] )
             : '';
     }
 
     /**
      * @return array
      */
-    protected function normalize(array $entries)
+    protected function normalize( array $entries )
     {
         $keys = [
             'msgctxt', 'msgid', 'msgid_plural', 'msgstr', 'msgstr[0]', 'msgstr[1]',
         ];
-        array_walk($entries, function (&$entry) use ($keys) {
-            foreach ($keys as $key) {
+        array_walk( $entries, function( &$entry ) use ($keys) {
+            foreach( $keys as $key ) {
                 try {
-                    $entry = $this->normalizeEntryString($entry, $key);
-                } catch (\TypeError $error) {
-                    glsr_log()->once('error', 'Translation/normalize', $error);
-                    glsr_log()->once('debug', 'Translation/normalize', $entry);
+                    $entry = $this->normalizeEntryString( $entry, $key );
+                } catch( \TypeError $error ) {
+                    glsr_log()->once( 'error', 'Translation/normalize', $error );
+                    glsr_log()->once( 'debug', 'Translation/normalize', $entry );
                 }
             }
         });
@@ -255,10 +255,10 @@ 
      * @param string $key
      * @return array
      */
-    protected function normalizeEntryString(array $entry, $key)
+    protected function normalizeEntryString( array $entry, $key )
     {
-        if (isset($entry[$key])) {
-            $entry[$key] = $this->getEntryString($entry, $key);
+        if( isset($entry[$key]) ) {
+            $entry[$key] = $this->getEntryString( $entry, $key );
         }
         return $entry;
     }
@@ -266,15 +266,15 @@ 
     /**
      * @return array
      */
-    protected function normalizeSettings(array $strings)
+    protected function normalizeSettings( array $strings )
     {
-        $defaultString = array_fill_keys(['id', 's1', 's2', 'p1', 'p2'], '');
-        $strings = array_filter($strings, 'is_array');
-        foreach ($strings as &$string) {
+        $defaultString = array_fill_keys( ['id', 's1', 's2', 'p1', 'p2'], '' );
+        $strings = array_filter( $strings, 'is_array' );
+        foreach( $strings as &$string ) {
             $string['type'] = isset($string['p1']) ? 'plural' : 'single';
-            $string = wp_parse_args($string, $defaultString);
+            $string = wp_parse_args( $string, $defaultString );
         }
-        return array_filter($strings, function ($string) {
+        return array_filter( $strings, function( $string ) {
             return !empty($string['id']);
         });
     }

plugin/Modules/Console.php

Braces +2 added lines, -1 removed lines

@@ -415,7 +415,8 @@
     {
         if ($value instanceof DateTime) {
             $value = $value->format('Y-m-d H:i:s');
-        } elseif ($this->isObjectOrArray($value)) {
+        }
+        elseif ($this->isObjectOrArray($value)) {
             $value = json_encode($value);
         }
         return (string) $value;

Indentation +429 added lines, -429 removed lines

@@ -9,433 +9,433 @@
 
 class Console
 {
-    const DEBUG = 0;      // Detailed debug information
-    const INFO = 1;       // Interesting events
-    const NOTICE = 2;     // Normal but significant events
-    const WARNING = 4;    // Exceptional occurrences that are not errors
-    const ERROR = 8;      // Runtime errors that do not require immediate action
-    const CRITICAL = 16;  // Critical conditions
-    const ALERT = 32;     // Action must be taken immediately
-    const EMERGENCY = 64; // System is unusable
-
-    protected $file;
-    protected $log;
-    protected $logOnceKey = 'glsr_log_once';
-
-    public function __construct()
-    {
-        $this->file = glsr()->path('console.log');
-        $this->log = file_exists($this->file)
-            ? file_get_contents($this->file)
-            : '';
-        $this->reset();
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->get();
-    }
-
-    /**
-     * Action must be taken immediately
-     * Example: Entire website down, database unavailable, etc. This should trigger the SMS alerts and wake you up.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function alert($message, array $context = [])
-    {
-        return $this->log(static::ALERT, $message, $context);
-    }
-
-    /**
-     * @return void
-     */
-    public function clear()
-    {
-        $this->log = '';
-        file_put_contents($this->file, $this->log);
-    }
-
-    /**
-     * Critical conditions
-     * Example: Application component unavailable, unexpected exception.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function critical($message, array $context = [])
-    {
-        return $this->log(static::CRITICAL, $message, $context);
-    }
-
-    /**
-     * Detailed debug information.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function debug($message, array $context = [])
-    {
-        return $this->log(static::DEBUG, $message, $context);
-    }
-
-    /**
-     * System is unusable.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function emergency($message, array $context = [])
-    {
-        return $this->log(static::EMERGENCY, $message, $context);
-    }
-
-    /**
-     * Runtime errors that do not require immediate action but should typically be logged and monitored.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function error($message, array $context = [])
-    {
-        return $this->log(static::ERROR, $message, $context);
-    }
-
-    /**
-     * @return string
-     */
-    public function get()
-    {
-        return empty($this->log)
-            ? __('Console is empty', 'site-reviews')
-            : $this->log;
-    }
-
-    /**
-     * @return int
-     */
-    public function getLevel()
-    {
-        return intval(apply_filters('site-reviews/console/level', static::INFO));
-    }
-
-    /**
-     * @return array
-     */
-    public function getLevels()
-    {
-        $constants = (new ReflectionClass(__CLASS__))->getConstants();
-        return array_map('strtolower', array_flip($constants));
-    }
-
-    /**
-     * @return string
-     */
-    public function humanLevel()
-    {
-        $level = $this->getLevel();
-        return sprintf('%s (%d)', strtoupper(Arr::get($this->getLevels(), $level, 'unknown')), $level);
-    }
-
-    /**
-     * @param string|null $valueIfEmpty
-     * @return string
-     */
-    public function humanSize($valueIfEmpty = null)
-    {
-        $bytes = $this->size();
-        if (empty($bytes) && is_string($valueIfEmpty)) {
-            return $valueIfEmpty;
-        }
-        $exponent = floor(log(max($bytes, 1), 1024));
-        return round($bytes / pow(1024, $exponent), 2).' '.['bytes', 'KB', 'MB', 'GB'][$exponent];
-    }
-
-    /**
-     * Interesting events
-     * Example: User logs in, SQL logs.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function info($message, array $context = [])
-    {
-        return $this->log(static::INFO, $message, $context);
-    }
-
-    /**
-     * @param int $level
-     * @param mixed $message
-     * @param array $context
-     * @param string $backtraceLine
-     * @return static
-     */
-    public function log($level, $message, $context = [], $backtraceLine = '')
-    {
-        if (empty($backtraceLine)) {
-            $backtraceLine = $this->getBacktraceLine();
-        }
-        if ($this->canLogEntry($level, $backtraceLine)) {
-            $levelName = Arr::get($this->getLevels(), $level);
-            $context = Arr::consolidateArray($context);
-            $backtraceLine = $this->normalizeBacktraceLine($backtraceLine);
-            $message = $this->interpolate($message, $context);
-            $entry = $this->buildLogEntry($levelName, $message, $backtraceLine);
-            file_put_contents($this->file, $entry.PHP_EOL, FILE_APPEND | LOCK_EX);
-            apply_filters('console', $message, $levelName, $backtraceLine); // Show in Blackbar plugin if installed
-            $this->reset();
-        }
-        return $this;
-    }
-
-    /**
-     * @return void
-     */
-    public function logOnce()
-    {
-        $once = Arr::consolidateArray(glsr()->{$this->logOnceKey});
-        $levels = $this->getLevels();
-        foreach ($once as $entry) {
-            $levelName = Arr::get($entry, 'level');
-            if (!in_array($levelName, $levels)) {
-                continue;
-            }
-            $level = Arr::get(array_flip($levels), $levelName);
-            $message = Arr::get($entry, 'message');
-            $backtraceLine = Arr::get($entry, 'backtrace');
-            $this->log($level, $message, [], $backtraceLine);
-        }
-        glsr()->{$this->logOnceKey} = [];
-    }
-
-    /**
-     * Normal but significant events.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function notice($message, array $context = [])
-    {
-        return $this->log(static::NOTICE, $message, $context);
-    }
-
-    /**
-     * @param string $levelName
-     * @param string $handle
-     * @param mixed $data
-     * @return void
-     */
-    public function once($levelName, $handle, $data)
-    {
-        $once = Arr::consolidateArray(glsr()->{$this->logOnceKey});
-        $filtered = array_filter($once, function ($entry) use ($levelName, $handle) {
-            return Arr::get($entry, 'level') == $levelName
-                && Arr::get($entry, 'handle') == $handle;
-        });
-        if (!empty($filtered)) {
-            return;
-        }
-        $once[] = [
-            'backtrace' => $this->getBacktraceLineFromData($data),
-            'handle' => $handle,
-            'level' => $levelName,
-            'message' => '[RECURRING] '.$this->getMessageFromData($data),
-        ];
-        glsr()->{$this->logOnceKey} = $once;
-    }
-
-    /**
-     * @return int
-     */
-    public function size()
-    {
-        return file_exists($this->file)
-            ? filesize($this->file)
-            : 0;
-    }
-
-    /**
-     * Exceptional occurrences that are not errors
-     * Example: Use of deprecated APIs, poor use of an API, undesirable things that are not necessarily wrong.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function warning($message, array $context = [])
-    {
-        return $this->log(static::WARNING, $message, $context);
-    }
-
-    /**
-     * @param array $backtrace
-     * @param int $index
-     * @return string
-     */
-    protected function buildBacktraceLine($backtrace, $index)
-    {
-        return sprintf('%s:%s',
-            Arr::get($backtrace, $index.'.file'), // realpath
-            Arr::get($backtrace, $index.'.line')
-        );
-    }
-
-    /**
-     * @param string $levelName
-     * @param mixed $message
-     * @param string $backtraceLine
-     * @return string
-     */
-    protected function buildLogEntry($levelName, $message, $backtraceLine = '')
-    {
-        return sprintf('[%s] %s [%s] %s',
-            current_time('mysql'),
-            strtoupper($levelName),
-            $backtraceLine,
-            $message
-        );
-    }
-
-    /**
-     * @param int $level
-     * @return bool
-     */
-    protected function canLogEntry($level, $backtraceLine)
-    {
-        $levelExists = array_key_exists($level, $this->getLevels());
-        if (false === strpos($backtraceLine, glsr()->path())) {
-            return $levelExists; // ignore level restriction if triggered outside of the plugin
-        }
-        return $levelExists && $level >= $this->getLevel();
-    }
-
-    /**
-     * @return void|string
-     */
-    protected function getBacktraceLine()
-    {
-        $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 6);
-        $search = array_search('log', glsr_array_column($backtrace, 'function'));
-        if (false !== $search) {
-            $index = '{closure}' == Arr::get($backtrace, ($search + 2).'.function')
-                ? $search + 4
-                : $search + 1;
-            return $this->buildBacktraceLine($backtrace, $index);
-        }
-        return 'Unknown';
-    }
-
-    /**
-     * @param mixed $data
-     * @return string
-     */
-    protected function getBacktraceLineFromData($data)
-    {
-        $backtrace = $data instanceof Throwable
-            ? $data->getTrace()
-            : debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-        return $this->buildBacktraceLine($backtrace, 0);
-    }
-
-    /**
-     * @param mixed $data
-     * @return string
-     */
-    protected function getMessageFromData($data)
-    {
-        return $data instanceof Throwable
-            ? $this->normalizeThrowableMessage($data->getMessage())
-            : print_r($data, 1);
-    }
-
-    /**
-     * Interpolates context values into the message placeholders.
-     * @param mixed $message
-     * @param array $context
-     * @return string
-     */
-    protected function interpolate($message, $context = [])
-    {
-        if ($this->isObjectOrArray($message) || !is_array($context)) {
-            return print_r($message, true);
-        }
-        $replace = [];
-        foreach ($context as $key => $value) {
-            $replace['{'.$key.'}'] = $this->normalizeValue($value);
-        }
-        return strtr($message, $replace);
-    }
-
-    /**
-     * @param mixed $value
-     * @return bool
-     */
-    protected function isObjectOrArray($value)
-    {
-        return is_object($value) || is_array($value);
-    }
-
-    /**
-     * @param string $backtraceLine
-     * @return string
-     */
-    protected function normalizeBacktraceLine($backtraceLine)
-    {
-        $search = [
-            glsr()->path('plugin/'),
-            glsr()->path('plugin/', false),
-            trailingslashit(glsr()->path()),
-            trailingslashit(glsr()->path('', false)),
-            WP_CONTENT_DIR,
-            ABSPATH,
-        ];
-        return str_replace(array_unique($search), '', $backtraceLine);
-    }
-
-    /**
-     * @param string $message
-     * @return string
-     */
-    protected function normalizeThrowableMessage($message)
-    {
-        $calledIn = strpos($message, ', called in');
-        return false !== $calledIn
-            ? substr($message, 0, $calledIn)
-            : $message;
-    }
-
-    /**
-     * @param mixed $value
-     * @return string
-     */
-    protected function normalizeValue($value)
-    {
-        if ($value instanceof DateTime) {
-            $value = $value->format('Y-m-d H:i:s');
-        } elseif ($this->isObjectOrArray($value)) {
-            $value = json_encode($value);
-        }
-        return (string) $value;
-    }
-
-    /**
-     * @return void
-     */
-    protected function reset()
-    {
-        if ($this->size() <= pow(1024, 2) / 8) {
-            return;
-        }
-        $this->clear();
-        file_put_contents(
-            $this->file,
-            $this->buildLogEntry(
-                static::NOTICE,
-                __('Console was automatically cleared (128 KB maximum size)', 'site-reviews')
-            )
-        );
-    }
+	const DEBUG = 0;      // Detailed debug information
+	const INFO = 1;       // Interesting events
+	const NOTICE = 2;     // Normal but significant events
+	const WARNING = 4;    // Exceptional occurrences that are not errors
+	const ERROR = 8;      // Runtime errors that do not require immediate action
+	const CRITICAL = 16;  // Critical conditions
+	const ALERT = 32;     // Action must be taken immediately
+	const EMERGENCY = 64; // System is unusable
+
+	protected $file;
+	protected $log;
+	protected $logOnceKey = 'glsr_log_once';
+
+	public function __construct()
+	{
+		$this->file = glsr()->path('console.log');
+		$this->log = file_exists($this->file)
+			? file_get_contents($this->file)
+			: '';
+		$this->reset();
+	}
+
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->get();
+	}
+
+	/**
+	 * Action must be taken immediately
+	 * Example: Entire website down, database unavailable, etc. This should trigger the SMS alerts and wake you up.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function alert($message, array $context = [])
+	{
+		return $this->log(static::ALERT, $message, $context);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function clear()
+	{
+		$this->log = '';
+		file_put_contents($this->file, $this->log);
+	}
+
+	/**
+	 * Critical conditions
+	 * Example: Application component unavailable, unexpected exception.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function critical($message, array $context = [])
+	{
+		return $this->log(static::CRITICAL, $message, $context);
+	}
+
+	/**
+	 * Detailed debug information.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function debug($message, array $context = [])
+	{
+		return $this->log(static::DEBUG, $message, $context);
+	}
+
+	/**
+	 * System is unusable.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function emergency($message, array $context = [])
+	{
+		return $this->log(static::EMERGENCY, $message, $context);
+	}
+
+	/**
+	 * Runtime errors that do not require immediate action but should typically be logged and monitored.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function error($message, array $context = [])
+	{
+		return $this->log(static::ERROR, $message, $context);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function get()
+	{
+		return empty($this->log)
+			? __('Console is empty', 'site-reviews')
+			: $this->log;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getLevel()
+	{
+		return intval(apply_filters('site-reviews/console/level', static::INFO));
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getLevels()
+	{
+		$constants = (new ReflectionClass(__CLASS__))->getConstants();
+		return array_map('strtolower', array_flip($constants));
+	}
+
+	/**
+	 * @return string
+	 */
+	public function humanLevel()
+	{
+		$level = $this->getLevel();
+		return sprintf('%s (%d)', strtoupper(Arr::get($this->getLevels(), $level, 'unknown')), $level);
+	}
+
+	/**
+	 * @param string|null $valueIfEmpty
+	 * @return string
+	 */
+	public function humanSize($valueIfEmpty = null)
+	{
+		$bytes = $this->size();
+		if (empty($bytes) && is_string($valueIfEmpty)) {
+			return $valueIfEmpty;
+		}
+		$exponent = floor(log(max($bytes, 1), 1024));
+		return round($bytes / pow(1024, $exponent), 2).' '.['bytes', 'KB', 'MB', 'GB'][$exponent];
+	}
+
+	/**
+	 * Interesting events
+	 * Example: User logs in, SQL logs.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function info($message, array $context = [])
+	{
+		return $this->log(static::INFO, $message, $context);
+	}
+
+	/**
+	 * @param int $level
+	 * @param mixed $message
+	 * @param array $context
+	 * @param string $backtraceLine
+	 * @return static
+	 */
+	public function log($level, $message, $context = [], $backtraceLine = '')
+	{
+		if (empty($backtraceLine)) {
+			$backtraceLine = $this->getBacktraceLine();
+		}
+		if ($this->canLogEntry($level, $backtraceLine)) {
+			$levelName = Arr::get($this->getLevels(), $level);
+			$context = Arr::consolidateArray($context);
+			$backtraceLine = $this->normalizeBacktraceLine($backtraceLine);
+			$message = $this->interpolate($message, $context);
+			$entry = $this->buildLogEntry($levelName, $message, $backtraceLine);
+			file_put_contents($this->file, $entry.PHP_EOL, FILE_APPEND | LOCK_EX);
+			apply_filters('console', $message, $levelName, $backtraceLine); // Show in Blackbar plugin if installed
+			$this->reset();
+		}
+		return $this;
+	}
+
+	/**
+	 * @return void
+	 */
+	public function logOnce()
+	{
+		$once = Arr::consolidateArray(glsr()->{$this->logOnceKey});
+		$levels = $this->getLevels();
+		foreach ($once as $entry) {
+			$levelName = Arr::get($entry, 'level');
+			if (!in_array($levelName, $levels)) {
+				continue;
+			}
+			$level = Arr::get(array_flip($levels), $levelName);
+			$message = Arr::get($entry, 'message');
+			$backtraceLine = Arr::get($entry, 'backtrace');
+			$this->log($level, $message, [], $backtraceLine);
+		}
+		glsr()->{$this->logOnceKey} = [];
+	}
+
+	/**
+	 * Normal but significant events.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function notice($message, array $context = [])
+	{
+		return $this->log(static::NOTICE, $message, $context);
+	}
+
+	/**
+	 * @param string $levelName
+	 * @param string $handle
+	 * @param mixed $data
+	 * @return void
+	 */
+	public function once($levelName, $handle, $data)
+	{
+		$once = Arr::consolidateArray(glsr()->{$this->logOnceKey});
+		$filtered = array_filter($once, function ($entry) use ($levelName, $handle) {
+			return Arr::get($entry, 'level') == $levelName
+				&& Arr::get($entry, 'handle') == $handle;
+		});
+		if (!empty($filtered)) {
+			return;
+		}
+		$once[] = [
+			'backtrace' => $this->getBacktraceLineFromData($data),
+			'handle' => $handle,
+			'level' => $levelName,
+			'message' => '[RECURRING] '.$this->getMessageFromData($data),
+		];
+		glsr()->{$this->logOnceKey} = $once;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function size()
+	{
+		return file_exists($this->file)
+			? filesize($this->file)
+			: 0;
+	}
+
+	/**
+	 * Exceptional occurrences that are not errors
+	 * Example: Use of deprecated APIs, poor use of an API, undesirable things that are not necessarily wrong.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function warning($message, array $context = [])
+	{
+		return $this->log(static::WARNING, $message, $context);
+	}
+
+	/**
+	 * @param array $backtrace
+	 * @param int $index
+	 * @return string
+	 */
+	protected function buildBacktraceLine($backtrace, $index)
+	{
+		return sprintf('%s:%s',
+			Arr::get($backtrace, $index.'.file'), // realpath
+			Arr::get($backtrace, $index.'.line')
+		);
+	}
+
+	/**
+	 * @param string $levelName
+	 * @param mixed $message
+	 * @param string $backtraceLine
+	 * @return string
+	 */
+	protected function buildLogEntry($levelName, $message, $backtraceLine = '')
+	{
+		return sprintf('[%s] %s [%s] %s',
+			current_time('mysql'),
+			strtoupper($levelName),
+			$backtraceLine,
+			$message
+		);
+	}
+
+	/**
+	 * @param int $level
+	 * @return bool
+	 */
+	protected function canLogEntry($level, $backtraceLine)
+	{
+		$levelExists = array_key_exists($level, $this->getLevels());
+		if (false === strpos($backtraceLine, glsr()->path())) {
+			return $levelExists; // ignore level restriction if triggered outside of the plugin
+		}
+		return $levelExists && $level >= $this->getLevel();
+	}
+
+	/**
+	 * @return void|string
+	 */
+	protected function getBacktraceLine()
+	{
+		$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 6);
+		$search = array_search('log', glsr_array_column($backtrace, 'function'));
+		if (false !== $search) {
+			$index = '{closure}' == Arr::get($backtrace, ($search + 2).'.function')
+				? $search + 4
+				: $search + 1;
+			return $this->buildBacktraceLine($backtrace, $index);
+		}
+		return 'Unknown';
+	}
+
+	/**
+	 * @param mixed $data
+	 * @return string
+	 */
+	protected function getBacktraceLineFromData($data)
+	{
+		$backtrace = $data instanceof Throwable
+			? $data->getTrace()
+			: debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
+		return $this->buildBacktraceLine($backtrace, 0);
+	}
+
+	/**
+	 * @param mixed $data
+	 * @return string
+	 */
+	protected function getMessageFromData($data)
+	{
+		return $data instanceof Throwable
+			? $this->normalizeThrowableMessage($data->getMessage())
+			: print_r($data, 1);
+	}
+
+	/**
+	 * Interpolates context values into the message placeholders.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return string
+	 */
+	protected function interpolate($message, $context = [])
+	{
+		if ($this->isObjectOrArray($message) || !is_array($context)) {
+			return print_r($message, true);
+		}
+		$replace = [];
+		foreach ($context as $key => $value) {
+			$replace['{'.$key.'}'] = $this->normalizeValue($value);
+		}
+		return strtr($message, $replace);
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return bool
+	 */
+	protected function isObjectOrArray($value)
+	{
+		return is_object($value) || is_array($value);
+	}
+
+	/**
+	 * @param string $backtraceLine
+	 * @return string
+	 */
+	protected function normalizeBacktraceLine($backtraceLine)
+	{
+		$search = [
+			glsr()->path('plugin/'),
+			glsr()->path('plugin/', false),
+			trailingslashit(glsr()->path()),
+			trailingslashit(glsr()->path('', false)),
+			WP_CONTENT_DIR,
+			ABSPATH,
+		];
+		return str_replace(array_unique($search), '', $backtraceLine);
+	}
+
+	/**
+	 * @param string $message
+	 * @return string
+	 */
+	protected function normalizeThrowableMessage($message)
+	{
+		$calledIn = strpos($message, ', called in');
+		return false !== $calledIn
+			? substr($message, 0, $calledIn)
+			: $message;
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return string
+	 */
+	protected function normalizeValue($value)
+	{
+		if ($value instanceof DateTime) {
+			$value = $value->format('Y-m-d H:i:s');
+		} elseif ($this->isObjectOrArray($value)) {
+			$value = json_encode($value);
+		}
+		return (string) $value;
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function reset()
+	{
+		if ($this->size() <= pow(1024, 2) / 8) {
+			return;
+		}
+		$this->clear();
+		file_put_contents(
+			$this->file,
+			$this->buildLogEntry(
+				static::NOTICE,
+				__('Console was automatically cleared (128 KB maximum size)', 'site-reviews')
+			)
+		);
+	}
 }

Spacing +111 added lines, -111 removed lines

@@ -9,13 +9,13 @@ 
 
 class Console
 {
-    const DEBUG = 0;      // Detailed debug information
-    const INFO = 1;       // Interesting events
-    const NOTICE = 2;     // Normal but significant events
-    const WARNING = 4;    // Exceptional occurrences that are not errors
-    const ERROR = 8;      // Runtime errors that do not require immediate action
-    const CRITICAL = 16;  // Critical conditions
-    const ALERT = 32;     // Action must be taken immediately
+    const DEBUG = 0; // Detailed debug information
+    const INFO = 1; // Interesting events
+    const NOTICE = 2; // Normal but significant events
+    const WARNING = 4; // Exceptional occurrences that are not errors
+    const ERROR = 8; // Runtime errors that do not require immediate action
+    const CRITICAL = 16; // Critical conditions
+    const ALERT = 32; // Action must be taken immediately
     const EMERGENCY = 64; // System is unusable
 
     protected $file;
@@ -24,9 +24,9 @@ 
 
     public function __construct()
     {
-        $this->file = glsr()->path('console.log');
-        $this->log = file_exists($this->file)
-            ? file_get_contents($this->file)
+        $this->file = glsr()->path( 'console.log' );
+        $this->log = file_exists( $this->file )
+            ? file_get_contents( $this->file )
             : '';
         $this->reset();
     }
@@ -46,9 +46,9 @@ 
      * @param array $context
      * @return static
      */
-    public function alert($message, array $context = [])
+    public function alert( $message, array $context = [] )
     {
-        return $this->log(static::ALERT, $message, $context);
+        return $this->log( static::ALERT, $message, $context );
     }
 
     /**
@@ -57,7 +57,7 @@ 
     public function clear()
     {
         $this->log = '';
-        file_put_contents($this->file, $this->log);
+        file_put_contents( $this->file, $this->log );
     }
 
     /**
@@ -67,9 +67,9 @@ 
      * @param array $context
      * @return static
      */
-    public function critical($message, array $context = [])
+    public function critical( $message, array $context = [] )
     {
-        return $this->log(static::CRITICAL, $message, $context);
+        return $this->log( static::CRITICAL, $message, $context );
     }
 
     /**
@@ -78,9 +78,9 @@ 
      * @param array $context
      * @return static
      */
-    public function debug($message, array $context = [])
+    public function debug( $message, array $context = [] )
     {
-        return $this->log(static::DEBUG, $message, $context);
+        return $this->log( static::DEBUG, $message, $context );
     }
 
     /**
@@ -89,9 +89,9 @@ 
      * @param array $context
      * @return static
      */
-    public function emergency($message, array $context = [])
+    public function emergency( $message, array $context = [] )
     {
-        return $this->log(static::EMERGENCY, $message, $context);
+        return $this->log( static::EMERGENCY, $message, $context );
     }
 
     /**
@@ -100,9 +100,9 @@ 
      * @param array $context
      * @return static
      */
-    public function error($message, array $context = [])
+    public function error( $message, array $context = [] )
     {
-        return $this->log(static::ERROR, $message, $context);
+        return $this->log( static::ERROR, $message, $context );
     }
 
     /**
@@ -111,7 +111,7 @@ 
     public function get()
     {
         return empty($this->log)
-            ? __('Console is empty', 'site-reviews')
+            ? __( 'Console is empty', 'site-reviews' )
             : $this->log;
     }
 
@@ -120,7 +120,7 @@ 
      */
     public function getLevel()
     {
-        return intval(apply_filters('site-reviews/console/level', static::INFO));
+        return intval( apply_filters( 'site-reviews/console/level', static::INFO ) );
     }
 
     /**
@@ -128,8 +128,8 @@ 
      */
     public function getLevels()
     {
-        $constants = (new ReflectionClass(__CLASS__))->getConstants();
-        return array_map('strtolower', array_flip($constants));
+        $constants = (new ReflectionClass( __CLASS__ ))->getConstants();
+        return array_map( 'strtolower', array_flip( $constants ) );
     }
 
     /**
@@ -138,21 +138,21 @@ 
     public function humanLevel()
     {
         $level = $this->getLevel();
-        return sprintf('%s (%d)', strtoupper(Arr::get($this->getLevels(), $level, 'unknown')), $level);
+        return sprintf( '%s (%d)', strtoupper( Arr::get( $this->getLevels(), $level, 'unknown' ) ), $level );
     }
 
     /**
      * @param string|null $valueIfEmpty
      * @return string
      */
-    public function humanSize($valueIfEmpty = null)
+    public function humanSize( $valueIfEmpty = null )
     {
         $bytes = $this->size();
-        if (empty($bytes) && is_string($valueIfEmpty)) {
+        if( empty($bytes) && is_string( $valueIfEmpty ) ) {
             return $valueIfEmpty;
         }
-        $exponent = floor(log(max($bytes, 1), 1024));
-        return round($bytes / pow(1024, $exponent), 2).' '.['bytes', 'KB', 'MB', 'GB'][$exponent];
+        $exponent = floor( log( max( $bytes, 1 ), 1024 ) );
+        return round( $bytes / pow( 1024, $exponent ), 2 ).' '.['bytes', 'KB', 'MB', 'GB'][$exponent];
     }
 
     /**
@@ -162,9 +162,9 @@ 
      * @param array $context
      * @return static
      */
-    public function info($message, array $context = [])
+    public function info( $message, array $context = [] )
     {
-        return $this->log(static::INFO, $message, $context);
+        return $this->log( static::INFO, $message, $context );
     }
 
     /**
@@ -174,19 +174,19 @@ 
      * @param string $backtraceLine
      * @return static
      */
-    public function log($level, $message, $context = [], $backtraceLine = '')
+    public function log( $level, $message, $context = [], $backtraceLine = '' )
     {
-        if (empty($backtraceLine)) {
+        if( empty($backtraceLine) ) {
             $backtraceLine = $this->getBacktraceLine();
         }
-        if ($this->canLogEntry($level, $backtraceLine)) {
-            $levelName = Arr::get($this->getLevels(), $level);
-            $context = Arr::consolidateArray($context);
-            $backtraceLine = $this->normalizeBacktraceLine($backtraceLine);
-            $message = $this->interpolate($message, $context);
-            $entry = $this->buildLogEntry($levelName, $message, $backtraceLine);
-            file_put_contents($this->file, $entry.PHP_EOL, FILE_APPEND | LOCK_EX);
-            apply_filters('console', $message, $levelName, $backtraceLine); // Show in Blackbar plugin if installed
+        if( $this->canLogEntry( $level, $backtraceLine ) ) {
+            $levelName = Arr::get( $this->getLevels(), $level );
+            $context = Arr::consolidateArray( $context );
+            $backtraceLine = $this->normalizeBacktraceLine( $backtraceLine );
+            $message = $this->interpolate( $message, $context );
+            $entry = $this->buildLogEntry( $levelName, $message, $backtraceLine );
+            file_put_contents( $this->file, $entry.PHP_EOL, FILE_APPEND | LOCK_EX );
+            apply_filters( 'console', $message, $levelName, $backtraceLine ); // Show in Blackbar plugin if installed
             $this->reset();
         }
         return $this;
@@ -197,17 +197,17 @@ 
      */
     public function logOnce()
     {
-        $once = Arr::consolidateArray(glsr()->{$this->logOnceKey});
+        $once = Arr::consolidateArray( glsr()->{$this->logOnceKey});
         $levels = $this->getLevels();
-        foreach ($once as $entry) {
-            $levelName = Arr::get($entry, 'level');
-            if (!in_array($levelName, $levels)) {
+        foreach( $once as $entry ) {
+            $levelName = Arr::get( $entry, 'level' );
+            if( !in_array( $levelName, $levels ) ) {
                 continue;
             }
-            $level = Arr::get(array_flip($levels), $levelName);
-            $message = Arr::get($entry, 'message');
-            $backtraceLine = Arr::get($entry, 'backtrace');
-            $this->log($level, $message, [], $backtraceLine);
+            $level = Arr::get( array_flip( $levels ), $levelName );
+            $message = Arr::get( $entry, 'message' );
+            $backtraceLine = Arr::get( $entry, 'backtrace' );
+            $this->log( $level, $message, [], $backtraceLine );
         }
         glsr()->{$this->logOnceKey} = [];
     }
@@ -218,9 +218,9 @@ 
      * @param array $context
      * @return static
      */
-    public function notice($message, array $context = [])
+    public function notice( $message, array $context = [] )
     {
-        return $this->log(static::NOTICE, $message, $context);
+        return $this->log( static::NOTICE, $message, $context );
     }
 
     /**
@@ -229,21 +229,21 @@ 
      * @param mixed $data
      * @return void
      */
-    public function once($levelName, $handle, $data)
+    public function once( $levelName, $handle, $data )
     {
-        $once = Arr::consolidateArray(glsr()->{$this->logOnceKey});
-        $filtered = array_filter($once, function ($entry) use ($levelName, $handle) {
-            return Arr::get($entry, 'level') == $levelName
-                && Arr::get($entry, 'handle') == $handle;
+        $once = Arr::consolidateArray( glsr()->{$this->logOnceKey});
+        $filtered = array_filter( $once, function( $entry ) use ($levelName, $handle) {
+            return Arr::get( $entry, 'level' ) == $levelName
+                && Arr::get( $entry, 'handle' ) == $handle;
         });
-        if (!empty($filtered)) {
+        if( !empty($filtered) ) {
             return;
         }
         $once[] = [
-            'backtrace' => $this->getBacktraceLineFromData($data),
+            'backtrace' => $this->getBacktraceLineFromData( $data ),
             'handle' => $handle,
             'level' => $levelName,
-            'message' => '[RECURRING] '.$this->getMessageFromData($data),
+            'message' => '[RECURRING] '.$this->getMessageFromData( $data ),
         ];
         glsr()->{$this->logOnceKey} = $once;
     }
@@ -253,8 +253,8 @@ 
      */
     public function size()
     {
-        return file_exists($this->file)
-            ? filesize($this->file)
+        return file_exists( $this->file )
+            ? filesize( $this->file )
             : 0;
     }
 
@@ -265,9 +265,9 @@ 
      * @param array $context
      * @return static
      */
-    public function warning($message, array $context = [])
+    public function warning( $message, array $context = [] )
     {
-        return $this->log(static::WARNING, $message, $context);
+        return $this->log( static::WARNING, $message, $context );
     }
 
     /**
@@ -275,11 +275,11 @@ 
      * @param int $index
      * @return string
      */
-    protected function buildBacktraceLine($backtrace, $index)
+    protected function buildBacktraceLine( $backtrace, $index )
     {
-        return sprintf('%s:%s',
-            Arr::get($backtrace, $index.'.file'), // realpath
-            Arr::get($backtrace, $index.'.line')
+        return sprintf( '%s:%s',
+            Arr::get( $backtrace, $index.'.file' ), // realpath
+            Arr::get( $backtrace, $index.'.line' )
         );
     }
 
@@ -289,11 +289,11 @@ 
      * @param string $backtraceLine
      * @return string
      */
-    protected function buildLogEntry($levelName, $message, $backtraceLine = '')
+    protected function buildLogEntry( $levelName, $message, $backtraceLine = '' )
     {
-        return sprintf('[%s] %s [%s] %s',
-            current_time('mysql'),
-            strtoupper($levelName),
+        return sprintf( '[%s] %s [%s] %s',
+            current_time( 'mysql' ),
+            strtoupper( $levelName ),
             $backtraceLine,
             $message
         );
@@ -303,10 +303,10 @@ 
      * @param int $level
      * @return bool
      */
-    protected function canLogEntry($level, $backtraceLine)
+    protected function canLogEntry( $level, $backtraceLine )
     {
-        $levelExists = array_key_exists($level, $this->getLevels());
-        if (false === strpos($backtraceLine, glsr()->path())) {
+        $levelExists = array_key_exists( $level, $this->getLevels() );
+        if( false === strpos( $backtraceLine, glsr()->path() ) ) {
             return $levelExists; // ignore level restriction if triggered outside of the plugin
         }
         return $levelExists && $level >= $this->getLevel();
@@ -317,13 +317,13 @@ 
      */
     protected function getBacktraceLine()
     {
-        $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 6);
-        $search = array_search('log', glsr_array_column($backtrace, 'function'));
-        if (false !== $search) {
-            $index = '{closure}' == Arr::get($backtrace, ($search + 2).'.function')
+        $backtrace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS, 6 );
+        $search = array_search( 'log', glsr_array_column( $backtrace, 'function' ) );
+        if( false !== $search ) {
+            $index = '{closure}' == Arr::get( $backtrace, ($search + 2).'.function' )
                 ? $search + 4
                 : $search + 1;
-            return $this->buildBacktraceLine($backtrace, $index);
+            return $this->buildBacktraceLine( $backtrace, $index );
         }
         return 'Unknown';
     }
@@ -332,23 +332,23 @@ 
      * @param mixed $data
      * @return string
      */
-    protected function getBacktraceLineFromData($data)
+    protected function getBacktraceLineFromData( $data )
     {
         $backtrace = $data instanceof Throwable
             ? $data->getTrace()
-            : debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-        return $this->buildBacktraceLine($backtrace, 0);
+            : debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS, 1 );
+        return $this->buildBacktraceLine( $backtrace, 0 );
     }
 
     /**
      * @param mixed $data
      * @return string
      */
-    protected function getMessageFromData($data)
+    protected function getMessageFromData( $data )
     {
         return $data instanceof Throwable
-            ? $this->normalizeThrowableMessage($data->getMessage())
-            : print_r($data, 1);
+            ? $this->normalizeThrowableMessage( $data->getMessage() )
+            : print_r( $data, 1 );
     }
 
     /**
@@ -357,53 +357,53 @@ 
      * @param array $context
      * @return string
      */
-    protected function interpolate($message, $context = [])
+    protected function interpolate( $message, $context = [] )
     {
-        if ($this->isObjectOrArray($message) || !is_array($context)) {
-            return print_r($message, true);
+        if( $this->isObjectOrArray( $message ) || !is_array( $context ) ) {
+            return print_r( $message, true );
         }
         $replace = [];
-        foreach ($context as $key => $value) {
-            $replace['{'.$key.'}'] = $this->normalizeValue($value);
+        foreach( $context as $key => $value ) {
+            $replace['{'.$key.'}'] = $this->normalizeValue( $value );
         }
-        return strtr($message, $replace);
+        return strtr( $message, $replace );
     }
 
     /**
      * @param mixed $value
      * @return bool
      */
-    protected function isObjectOrArray($value)
+    protected function isObjectOrArray( $value )
     {
-        return is_object($value) || is_array($value);
+        return is_object( $value ) || is_array( $value );
     }
 
     /**
      * @param string $backtraceLine
      * @return string
      */
-    protected function normalizeBacktraceLine($backtraceLine)
+    protected function normalizeBacktraceLine( $backtraceLine )
     {
         $search = [
-            glsr()->path('plugin/'),
-            glsr()->path('plugin/', false),
-            trailingslashit(glsr()->path()),
-            trailingslashit(glsr()->path('', false)),
+            glsr()->path( 'plugin/' ),
+            glsr()->path( 'plugin/', false ),
+            trailingslashit( glsr()->path() ),
+            trailingslashit( glsr()->path( '', false ) ),
             WP_CONTENT_DIR,
             ABSPATH,
         ];
-        return str_replace(array_unique($search), '', $backtraceLine);
+        return str_replace( array_unique( $search ), '', $backtraceLine );
     }
 
     /**
      * @param string $message
      * @return string
      */
-    protected function normalizeThrowableMessage($message)
+    protected function normalizeThrowableMessage( $message )
     {
-        $calledIn = strpos($message, ', called in');
+        $calledIn = strpos( $message, ', called in' );
         return false !== $calledIn
-            ? substr($message, 0, $calledIn)
+            ? substr( $message, 0, $calledIn )
             : $message;
     }
 
@@ -411,14 +411,14 @@ 
      * @param mixed $value
      * @return string
      */
-    protected function normalizeValue($value)
+    protected function normalizeValue( $value )
     {
-        if ($value instanceof DateTime) {
-            $value = $value->format('Y-m-d H:i:s');
-        } elseif ($this->isObjectOrArray($value)) {
-            $value = json_encode($value);
+        if( $value instanceof DateTime ) {
+            $value = $value->format( 'Y-m-d H:i:s' );
+        } elseif( $this->isObjectOrArray( $value ) ) {
+            $value = json_encode( $value );
         }
-        return (string) $value;
+        return (string)$value;
     }
 
     /**
@@ -426,7 +426,7 @@ 
      */
     protected function reset()
     {
-        if ($this->size() <= pow(1024, 2) / 8) {
+        if( $this->size() <= pow( 1024, 2 ) / 8 ) {
             return;
         }
         $this->clear();
@@ -434,7 +434,7 @@ 
             $this->file,
             $this->buildLogEntry(
                 static::NOTICE,
-                __('Console was automatically cleared (128 KB maximum size)', 'site-reviews')
+                __( 'Console was automatically cleared (128 KB maximum size)', 'site-reviews' )
             )
         );
     }

plugin/Modules/Schema/Thing.php

Indentation +8 added lines, -8 removed lines

@@ -19,12 +19,12 @@
  */
 class Thing extends BaseType
 {
-    /**
-     * @var array
-     * @see http://schema.org/{property_name}
-     */
-    public $allowed = [
-        'additionalType', 'alternateName', 'description', 'disambiguatingDescription', 'identifier',
-        'image', 'mainEntityOfPage', 'name', 'potentialAction', 'sameAs', 'url',
-    ];
+	/**
+	 * @var array
+	 * @see http://schema.org/{property_name}
+	 */
+	public $allowed = [
+		'additionalType', 'alternateName', 'description', 'disambiguatingDescription', 'identifier',
+		'image', 'mainEntityOfPage', 'name', 'potentialAction', 'sameAs', 'url',
+	];
 }

plugin/Modules/Schema/UnknownType.php

Indentation +14 added lines, -14 removed lines

@@ -4,19 +4,19 @@
 
 class UnknownType extends BaseType
 {
-    /**
-     * @var array
-     * @see http://schema.org/{property_name}
-     */
-    public $allowed = [
-        'aggregateRating',
-    ];
+	/**
+	 * @var array
+	 * @see http://schema.org/{property_name}
+	 */
+	public $allowed = [
+		'aggregateRating',
+	];
 
-    /**
-     * @var array
-     * @see http://schema.org/{property_name}
-     */
-    public $parents = [
-        'Thing',
-    ];
+	/**
+	 * @var array
+	 * @see http://schema.org/{property_name}
+	 */
+	public $parents = [
+		'Thing',
+	];
 }

plugin/Modules/Schema/Type.php

Indentation +16 added lines, -16 removed lines

@@ -4,22 +4,22 @@
 
 interface Type
 {
-    /**
-     * Return an array representation of the type. If the array contains child types,
-     * their context needs to be stripped if it's the same.
-     * @return array
-     */
-    public function toArray();
+	/**
+	 * Return an array representation of the type. If the array contains child types,
+	 * their context needs to be stripped if it's the same.
+	 * @return array
+	 */
+	public function toArray();
 
-    /**
-     * Create a json-ld script tag for this type, built from the data that `toArray` returns.
-     * @return string
-     */
-    public function toScript();
+	/**
+	 * Create a json-ld script tag for this type, built from the data that `toArray` returns.
+	 * @return string
+	 */
+	public function toScript();
 
-    /**
-     * Create a json-ld script tag for this type, built from the data that `toArray` returns.
-     * @return string
-     */
-    public function __toString();
+	/**
+	 * Create a json-ld script tag for this type, built from the data that `toArray` returns.
+	 * @return string
+	 */
+	public function __toString();
 }

plugin/Modules/Schema/Organization.php

Indentation +162 added lines, -162 removed lines

@@ -57,166 +57,166 @@
  */
 class Organization extends BaseType
 {
-    /**
-     * The schema.org Actions mechanism benefited from extensive discussions across the Web
-     * standards community around W3C, in particular from the [Hydra project](http://purl.org/hydra/)
-     * community group.
-     * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_ActionCollabClass
-     */
-    const ActionCollabClass = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_ActionCollabClass';
-
-    /**
-     * This element is based on the work of the Automotive Ontology Working Group,
-     * see [www.automotive-ontology.org](http://www.automotive-ontology.org) for details.
-     * Many class and property definitions are inspired by or based on abstracts from Wikipedia,
-     * the free encyclopedia.
-     * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#Automotive_Ontology_Working_Group
-     */
-    const AutomotiveOntologyWGClass = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#Automotive_Ontology_Working_Group';
-
-    /**
-     * The W3C [Schema Bib Extend](http://www.w3.org/community/schemabibex/) (BibEx) group led the
-     * work to improve schema.org for bibliographic information, including terms for periodicals,
-     * articles and multi-volume works. The design was inspired in places (e.g. [[pageStart]],
-     * [[pageEnd]], [[pagination]]) by the [Bibliographic Ontology](http://bibliontology.com/),
-     * 'bibo'.
-     * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_bibex
-     */
-    const BibExTerm = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_bibex';
-
-    /**
-     * This class is based upon W3C DCAT work, and benefits from collaboration around the DCAT, ADMS
-     * and VoID vocabularies. See http://www.w3.org/wiki/WebSchemas/Datasets for full details and
-     * mappings.
-     * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_DatasetClass
-     */
-    const DatasetClass = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_DatasetClass';
-
-    /**
-     * This element is based on the work of the Financial Industry Business Ontology project (see
-     * [http://www.fibo.org/schema](http://www.fibo.org/schema) for details), in support of the W3C
-     * Financial Industry Business Ontology Community Group
-     * ([http://www.fibo.org/community](http://www.fibo.org/community)). Many class and property
-     * definitions are inspired by or based on [http://www.fibo.org](http://www.fibo.org).
-     * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#FIBO
-     */
-    const FIBO = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#FIBO';
-
-    /**
-     * The implementation and use of Legal Entity Identifier (LEI) is supported by Global Legal
-     * Entity Identifier Foundation [https://www.gleif.org](https://www.gleif.org).
-     * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#GLEIF
-     */
-    const GLEIF = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#GLEIF';
-
-    /**
-     * This class is derived from the GoodRelations Vocabulary for E-Commerce, created by Martin
-     * Hepp. GoodRelations is a data model for sharing e-commerce data on the Web that can be
-     * expressed in a variety of syntaxes, including RDFa and HTML5 Microdata. More information
-     * about GoodRelations can be found at
-     * [http://purl.org/goodrelations/](http://purl.org/goodrelations/).
-     * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_GoodRelationsClass
-     */
-    const GoodRelationsClass = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_GoodRelationsClass';
-
-    /**
-     * This term [uses](http://blog.schema.org/2012/11/good-relations-and-schemaorg.html)
-     * terminology from the GoodRelations Vocabulary for E-Commerce, created by Martin Hepp.
-     * GoodRelations is a data model for sharing e-commerce data on the Web. More information about
-     * GoodRelations can be found at
-     * [http://purl.org/goodrelations/](http://purl.org/goodrelations/).
-     * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_GoodRelationsTerms
-     */
-    const GoodRelationsTerms = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_GoodRelationsTerms';
-
-    /**
-     * This element is based on work by the Web Applications for the Future Internet Lab, Institute
-     * of Informatics and Telematics, Pisa, Italy.
-     * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#IIT-CNR.it
-     */
-    const IITCNRit = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#IIT-CNR.it';
-
-    /**
-     * This class is based on the work of the LRMI project, see lrmi.net for details.
-     * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_LRMIClass
-     */
-    const LRMIClass = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_LRMIClass';
-
-    /**
-     * This vocabulary was improved through collaboration with the MusicBrainz project
-     *     ([www.musicbrainz.org](http://www.musicbrainz.org)), and is partially inspired by the
-     * MusicBrainz and
-     *     [Music Ontology](http://musicontology.com/docs/getting-started.html) schemas.
-     * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#MBZ
-     */
-    const MBZ = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#MBZ';
-
-    /**
-     * This element is based on the STI Accommodation Ontology, see <a
-     * href="http://ontologies.sti-innsbruck.at/acco/ns.html">http://ontologies.sti-innsbruck.at/acco/ns.html</a>
-     * for details.
-     *     Many class and property definitions are inspired by or based on abstracts from Wikipedia,
-     * the free encyclopedia.
-     * @see https://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#STI_Accommodation_Ontology
-     */
-    const STI_Accommodation_Ontology = 'https://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#STI_Accommodation_Ontology';
-
-    /**
-     * The Question/Answer types were [based
-     * on](https://www.w3.org/wiki/WebSchemas/QASchemaResearch) the Stack Overflow API.
-     * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_QAStackExchange
-     */
-    const Stack_Exchange = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_QAStackExchange';
-
-    /**
-     * This term and associated definitions draws upon the work of [The Trust
-     * Project](http://thetrustproject.org/).
-     * @see https://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#TP-draws
-     */
-    const The_Trust_Project = 'https://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#TP-draws';
-
-    /**
-     * This element is based on the work of the [Tourism Structured Web Data Community
-     * Group](https://www.w3.org/community/tourismdata).
-     * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#Tourism
-     */
-    const Tourism = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#Tourism';
-
-    /**
-     * This class contains information contributed by
-     * [http://wikidoc.org>WikiDoc](http://wikidoc.org>WikiDoc).
-     * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_WikiDoc
-     */
-    const WikiDoc = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_WikiDoc';
-
-    /**
-     * This class contains derivatives of IPTC rNews properties. rNews is a data model of publishing
-     * metadata with serializations currently available for RDFa as well as HTML5 Microdata. More
-     * information about the IPTC and rNews can be found at [rnews.org](http://rnews.org).
-     * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_rNews
-     */
-    const rNews = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_rNews';
-
-    /**
-     * @var array
-     * @see http://schema.org/{property_name}
-     */
-    public $allowed = [
-        'address', 'aggregateRating', 'areaServed', 'award', 'awards', 'brand', 'contactPoint',
-        'contactPoints', 'department', 'dissolutionDate', 'duns', 'email', 'employee', 'employees',
-        'event', 'events', 'faxNumber', 'founder', 'founders', 'foundingDate', 'foundingLocation',
-        'funder', 'globalLocationNumber', 'hasOfferCatalog', 'hasPOS', 'isicV4', 'legalName',
-        'leiCode', 'location', 'logo', 'makesOffer', 'member', 'memberOf', 'members', 'naics',
-        'numberOfEmployees', 'offeredBy', 'owns', 'parentOrganization', 'publishingPrinciples',
-        'review', 'reviews', 'seeks', 'serviceArea', 'sponsor', 'subOrganization', 'taxID',
-        'telephone', 'vatID',
-    ];
-
-    /**
-     * @var array
-     * @see http://schema.org/{property_name}
-     */
-    public $parents = [
-        'Thing',
-    ];
+	/**
+	 * The schema.org Actions mechanism benefited from extensive discussions across the Web
+	 * standards community around W3C, in particular from the [Hydra project](http://purl.org/hydra/)
+	 * community group.
+	 * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_ActionCollabClass
+	 */
+	const ActionCollabClass = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_ActionCollabClass';
+
+	/**
+	 * This element is based on the work of the Automotive Ontology Working Group,
+	 * see [www.automotive-ontology.org](http://www.automotive-ontology.org) for details.
+	 * Many class and property definitions are inspired by or based on abstracts from Wikipedia,
+	 * the free encyclopedia.
+	 * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#Automotive_Ontology_Working_Group
+	 */
+	const AutomotiveOntologyWGClass = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#Automotive_Ontology_Working_Group';
+
+	/**
+	 * The W3C [Schema Bib Extend](http://www.w3.org/community/schemabibex/) (BibEx) group led the
+	 * work to improve schema.org for bibliographic information, including terms for periodicals,
+	 * articles and multi-volume works. The design was inspired in places (e.g. [[pageStart]],
+	 * [[pageEnd]], [[pagination]]) by the [Bibliographic Ontology](http://bibliontology.com/),
+	 * 'bibo'.
+	 * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_bibex
+	 */
+	const BibExTerm = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_bibex';
+
+	/**
+	 * This class is based upon W3C DCAT work, and benefits from collaboration around the DCAT, ADMS
+	 * and VoID vocabularies. See http://www.w3.org/wiki/WebSchemas/Datasets for full details and
+	 * mappings.
+	 * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_DatasetClass
+	 */
+	const DatasetClass = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_DatasetClass';
+
+	/**
+	 * This element is based on the work of the Financial Industry Business Ontology project (see
+	 * [http://www.fibo.org/schema](http://www.fibo.org/schema) for details), in support of the W3C
+	 * Financial Industry Business Ontology Community Group
+	 * ([http://www.fibo.org/community](http://www.fibo.org/community)). Many class and property
+	 * definitions are inspired by or based on [http://www.fibo.org](http://www.fibo.org).
+	 * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#FIBO
+	 */
+	const FIBO = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#FIBO';
+
+	/**
+	 * The implementation and use of Legal Entity Identifier (LEI) is supported by Global Legal
+	 * Entity Identifier Foundation [https://www.gleif.org](https://www.gleif.org).
+	 * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#GLEIF
+	 */
+	const GLEIF = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#GLEIF';
+
+	/**
+	 * This class is derived from the GoodRelations Vocabulary for E-Commerce, created by Martin
+	 * Hepp. GoodRelations is a data model for sharing e-commerce data on the Web that can be
+	 * expressed in a variety of syntaxes, including RDFa and HTML5 Microdata. More information
+	 * about GoodRelations can be found at
+	 * [http://purl.org/goodrelations/](http://purl.org/goodrelations/).
+	 * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_GoodRelationsClass
+	 */
+	const GoodRelationsClass = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_GoodRelationsClass';
+
+	/**
+	 * This term [uses](http://blog.schema.org/2012/11/good-relations-and-schemaorg.html)
+	 * terminology from the GoodRelations Vocabulary for E-Commerce, created by Martin Hepp.
+	 * GoodRelations is a data model for sharing e-commerce data on the Web. More information about
+	 * GoodRelations can be found at
+	 * [http://purl.org/goodrelations/](http://purl.org/goodrelations/).
+	 * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_GoodRelationsTerms
+	 */
+	const GoodRelationsTerms = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_GoodRelationsTerms';
+
+	/**
+	 * This element is based on work by the Web Applications for the Future Internet Lab, Institute
+	 * of Informatics and Telematics, Pisa, Italy.
+	 * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#IIT-CNR.it
+	 */
+	const IITCNRit = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#IIT-CNR.it';
+
+	/**
+	 * This class is based on the work of the LRMI project, see lrmi.net for details.
+	 * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_LRMIClass
+	 */
+	const LRMIClass = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_LRMIClass';
+
+	/**
+	 * This vocabulary was improved through collaboration with the MusicBrainz project
+	 *     ([www.musicbrainz.org](http://www.musicbrainz.org)), and is partially inspired by the
+	 * MusicBrainz and
+	 *     [Music Ontology](http://musicontology.com/docs/getting-started.html) schemas.
+	 * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#MBZ
+	 */
+	const MBZ = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#MBZ';
+
+	/**
+	 * This element is based on the STI Accommodation Ontology, see <a
+	 * href="http://ontologies.sti-innsbruck.at/acco/ns.html">http://ontologies.sti-innsbruck.at/acco/ns.html</a>
+	 * for details.
+	 *     Many class and property definitions are inspired by or based on abstracts from Wikipedia,
+	 * the free encyclopedia.
+	 * @see https://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#STI_Accommodation_Ontology
+	 */
+	const STI_Accommodation_Ontology = 'https://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#STI_Accommodation_Ontology';
+
+	/**
+	 * The Question/Answer types were [based
+	 * on](https://www.w3.org/wiki/WebSchemas/QASchemaResearch) the Stack Overflow API.
+	 * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_QAStackExchange
+	 */
+	const Stack_Exchange = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_QAStackExchange';
+
+	/**
+	 * This term and associated definitions draws upon the work of [The Trust
+	 * Project](http://thetrustproject.org/).
+	 * @see https://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#TP-draws
+	 */
+	const The_Trust_Project = 'https://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#TP-draws';
+
+	/**
+	 * This element is based on the work of the [Tourism Structured Web Data Community
+	 * Group](https://www.w3.org/community/tourismdata).
+	 * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#Tourism
+	 */
+	const Tourism = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#Tourism';
+
+	/**
+	 * This class contains information contributed by
+	 * [http://wikidoc.org>WikiDoc](http://wikidoc.org>WikiDoc).
+	 * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_WikiDoc
+	 */
+	const WikiDoc = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_WikiDoc';
+
+	/**
+	 * This class contains derivatives of IPTC rNews properties. rNews is a data model of publishing
+	 * metadata with serializations currently available for RDFa as well as HTML5 Microdata. More
+	 * information about the IPTC and rNews can be found at [rnews.org](http://rnews.org).
+	 * @see http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_rNews
+	 */
+	const rNews = 'http://www.w3.org/wiki/WebSchemas/SchemaDotOrgSources#source_rNews';
+
+	/**
+	 * @var array
+	 * @see http://schema.org/{property_name}
+	 */
+	public $allowed = [
+		'address', 'aggregateRating', 'areaServed', 'award', 'awards', 'brand', 'contactPoint',
+		'contactPoints', 'department', 'dissolutionDate', 'duns', 'email', 'employee', 'employees',
+		'event', 'events', 'faxNumber', 'founder', 'founders', 'foundingDate', 'foundingLocation',
+		'funder', 'globalLocationNumber', 'hasOfferCatalog', 'hasPOS', 'isicV4', 'legalName',
+		'leiCode', 'location', 'logo', 'makesOffer', 'member', 'memberOf', 'members', 'naics',
+		'numberOfEmployees', 'offeredBy', 'owns', 'parentOrganization', 'publishingPrinciples',
+		'review', 'reviews', 'seeks', 'serviceArea', 'sponsor', 'subOrganization', 'taxID',
+		'telephone', 'vatID',
+	];
+
+	/**
+	 * @var array
+	 * @see http://schema.org/{property_name}
+	 */
+	public $parents = [
+		'Thing',
+	];
 }

plugin/Modules/Schema/Intangible.php

Indentation +7 added lines, -7 removed lines

@@ -9,11 +9,11 @@
  */
 class Intangible extends BaseType
 {
-    /**
-     * @var array
-     * @see http://schema.org/{property_name}
-     */
-    public $parents = [
-        'Thing',
-    ];
+	/**
+	 * @var array
+	 * @see http://schema.org/{property_name}
+	 */
+	public $parents = [
+		'Thing',
+	];
 }

plugin/Modules/Schema/Place.php

Indentation +18 added lines, -18 removed lines

@@ -37,23 +37,23 @@
  */
 class Place extends BaseType
 {
-    /**
-     * @var array
-     * @see http://schema.org/{property_name}
-     */
-    public $allowed = [
-        'additionalProperty', 'address', 'aggregateRating', 'amenityFeature', 'branchCode',
-        'containedIn', 'containedInPlace', 'containsPlace', 'event', 'events', 'faxNumber', 'geo',
-        'globalLocationNumber', 'hasMap', 'isAccessibleForFree', 'isicV4', 'logo', 'map', 'maps',
-        'maximumAttendeeCapacity', 'openingHoursSpecification', 'photo', 'photos', 'publicAccess',
-        'review', 'reviews', 'smokingAllowed', 'specialOpeningHoursSpecification', 'telephone',
-    ];
+	/**
+	 * @var array
+	 * @see http://schema.org/{property_name}
+	 */
+	public $allowed = [
+		'additionalProperty', 'address', 'aggregateRating', 'amenityFeature', 'branchCode',
+		'containedIn', 'containedInPlace', 'containsPlace', 'event', 'events', 'faxNumber', 'geo',
+		'globalLocationNumber', 'hasMap', 'isAccessibleForFree', 'isicV4', 'logo', 'map', 'maps',
+		'maximumAttendeeCapacity', 'openingHoursSpecification', 'photo', 'photos', 'publicAccess',
+		'review', 'reviews', 'smokingAllowed', 'specialOpeningHoursSpecification', 'telephone',
+	];
 
-    /**
-     * @var array
-     * @see http://schema.org/{property_name}
-     */
-    public $parents = [
-        'Thing',
-    ];
+	/**
+	 * @var array
+	 * @see http://schema.org/{property_name}
+	 */
+	public $parents = [
+		'Thing',
+	];
 }

plugin/Modules/Schema/Review.php

Indentation +14 added lines, -14 removed lines

@@ -11,19 +11,19 @@
  */
 class Review extends BaseType
 {
-    /**
-     * @var array
-     * @see http://schema.org/{property_name}
-     */
-    public $allowed = [
-        'itemReviewed', 'reviewBody', 'reviewRating',
-    ];
+	/**
+	 * @var array
+	 * @see http://schema.org/{property_name}
+	 */
+	public $allowed = [
+		'itemReviewed', 'reviewBody', 'reviewRating',
+	];
 
-    /**
-     * @var array
-     * @see http://schema.org/{property_name}
-     */
-    public $parents = [
-        'CreativeWork',
-    ];
+	/**
+	 * @var array
+	 * @see http://schema.org/{property_name}
+	 */
+	public $parents = [
+		'CreativeWork',
+	];
 }