Fix syntax

src/TgUtils/DummyStringFilter.php

@@ -1,25 +1,25 @@
 <?php
 
-package TgUtils;
+namespace TgUtils;
 
 /**
  * An interface for not filtering string at all.
  */
-public class DummyStringFilter implements StringFilter {
+class DummyStringFilter implements StringFilter {
 
-	public static $INSTANCE = new DummyStringFilter();
+	public static $INSTANCE;
 
-	public __construct() {
+	public function __construct() {
 	}
 
 	/**
 	 * Filters the given string and returns sanitized value.
 	 * @param string $s - string to sanitize (can be null)
 	 * @return the sanitized string.
 	 */
-	public filter($s) {
+	public function filter($s) {
 		return $s;
 	}
 
 }
-
+DummyStringFilter::$INSTANCE = new DummyStringFilter();

src/TgUtils/NoHtmlStringFilter.php

@@ -1,26 +1,27 @@
 <?php
 
-package TgUtils;
+namespace TgUtils;
 
 /**
  * An interface for filter strings from any HTML tags.
  */
-public class NoHtmlStringFilter implements StringFilter {
+class NoHtmlStringFilter implements StringFilter {
 
-	public static $INSTANCE = new NoHtmlStringFilter();
+	public static $INSTANCE;
 
-	public __construct() {
+	public function __construct() {
 	}
 
 	/**
 	 * Filters the given string and returns sanitized value.
 	 * @param string $s - string to sanitize (can be null)
 	 * @return the sanitized string.
 	 */
-	public filter($s) {
+	public function filter($s) {
 		if ($s == NULL) return $s;
 		return strip_tags($s);
 	}
 
 }
+NoHtmlStringFilter::$INSTANCE = new NoHtmlStringFilter();
 

src/TgUtils/Request.php

@@ -193,7 +193,7 @@ public function hasGetParam($key) {
 	 */
 	public function getGetParam($key, $default = NULL, $filter = NULL) {
 		$params = $this->getParams;
-		if ($filter == NULL) $filter = StringFilters::$NO_HTML;
+		if ($filter == NULL) $filter = NoHtmlStringFilter::$INSTANCE;
 		return isset($params[$key]) ? $filter->filter($params[$key]) : $default;
 	}
 
@@ -223,7 +223,7 @@ public function hasPostParam($key) {
 	 */
 	public function getPostParam($key, $default = NULL, $filter = NULL) {
 		$params = $this->getPostParams();
-		if ($filter == NULL) $filter = StringFilters::$NO_HTML;
+		if ($filter == NULL) $filter = NoHtmlStringFilter::$INSTANCE;
 		return isset($params[$key]) ? $filter->filter($params[$key]) : $default;
 	}
 

src/TgUtils/StringFilter.php

@@ -1,18 +1,18 @@
 <?php
 
-package TgUtils;
+namespace TgUtils;
 
 /**
  * An interface for filter strings from evil input.
  */
-public interface StringFilter {
+interface StringFilter {
 
 	/**
 	 * Filters the given string and returns sanitized value.
 	 * @param string $s - string to sanitize (can be null)
 	 * @return the sanitized string.
 	 */
-	public filter($s);
+	public function filter($s);
 
 }