Merge branch 'master' of github.com:onPHP/onphp-framework

Author: ssserj

core/Form/Filters/CallbackFilter.class.php

@@ -0,0 +1,40 @@
+<?php
+/***************************************************************************
+ *   Copyright (C) 2011 by Alexey S. Denisov                               *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License as        *
+ *   published by the Free Software Foundation; either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ ***************************************************************************/
+
+	/**
+	 * @ingroup Filters
+	**/
+	final class CallbackFilter implements Filtrator
+	{
+		/**
+		 * @var Closure
+		 */
+		private $callback = null;
+		
+		/**
+		 * @return CallbackFilter
+		**/
+		public static function create(Closure $callback)
+		{
+			return new self($callback);
+		}
+		
+		public function __construct(Closure $callback)
+		{
+			$this->callback = $callback;
+		}
+		
+		public function apply($value)
+		{
+			return $this->callback->__invoke($value);
+		}
+	}
+?>

doc/ChangeLog

@@ -2,6 +2,11 @@
 
 	* main/Crypto/Base62Utils.class.php: assert check in decode() added.
 
+2011-06-01	Alexey S. Denisov
+
+	* core/Form/Filters/CallbackFilter.class.php: implemented CallbackFilter
+	to work with anonymous functions.
+
 2011-06-01	Sergey S. Sergeev
 
 	* main/Crypto/Base62Utils.class.php: Base62 encode/decode implemented.

main/Net/Mail/Mail.class.php

@@ -8,16 +8,6 @@
  *   License, or (at your option) any later version.                       *
  *                                                                         *
  ***************************************************************************/
-
-	/**
-	 * @ingroup Exceptions
-	**/
-	class MailException extends BaseException {/*_*/};
-	
-	/**
-	 * @ingroup Exceptions
-	**/
-	class MailNotSentException extends MailException {/*_*/};
 
 	/**
 	 * @ingroup Mail

main/Net/Mail/MailException.class.php

@@ -0,0 +1,16 @@
+<?php
+/***************************************************************************
+ *   Copyright (C) 2004-2007 by Anton E. Lebedevich                        *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License as        *
+ *   published by the Free Software Foundation; either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ ***************************************************************************/
+
+	/**
+	 * @ingroup Exceptions
+	**/
+	class MailException extends BaseException {/*_*/};
+?>

main/Net/Mail/MailNotSentException.class.php

@@ -0,0 +1,16 @@
+<?php
+/***************************************************************************
+ *   Copyright (C) 2004-2007 by Anton E. Lebedevich                        *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License as        *
+ *   published by the Free Software Foundation; either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ ***************************************************************************/
+
+	/**
+	 * @ingroup Exceptions
+	**/
+	class MailNotSentException extends MailException {/*_*/};
+?>

test/core/FiltersTest.class.php

@@ -228,5 +228,19 @@ public function testUtf16ConverterFilter()
 				Utf16ConverterFilter::me()->apply('привет')
 			);
 		}
+		
+		public function testCallbackFilter()
+		{
+			//simple test
+			$postApply = ' and my applying';
+			$filter = CallbackFilter::create(function($value) use ($postApply) {
+				return $value . $postApply;
+			});
+			
+			$this->assertEquals(
+				'one another value and my applying',
+				$filter->apply('one another value')
+			);
+		}
 	}
 ?>