Commit: 1f75449c7c6eacebf67c7c66d697607a7fae1ced
Author: gwoo | Date: 2010-01-05 13:24:47 -0800
diff --git a/controllers/LogsController.php b/controllers/LogsController.php
index 7e10f9d..e8cac8e 100644
--- a/controllers/LogsController.php
+++ b/controllers/LogsController.php
@@ -1,4 +1,10 @@
<?php
+/**
+ * Lithium: the most rad php framework
+ *
+ * @copyright Copyright 2009, Union of RAD (http://union-of-rad.org)
+ * @license http://opensource.org/licenses/bsd-license.php The BSD License
+ */
namespace li3_bot\controllers;
diff --git a/extensions/command/Bot.php b/extensions/command/Bot.php
index d772147..52f4c29 100644
--- a/extensions/command/Bot.php
+++ b/extensions/command/Bot.php
@@ -1,4 +1,10 @@
<?php
+/**
+ * Lithium: the most rad php framework
+ *
+ * @copyright Copyright 2009, Union of RAD (http://union-of-rad.org)
+ * @license http://opensource.org/licenses/bsd-license.php The BSD License
+ */
namespace li3_bot\extensions\command;
diff --git a/extensions/command/bot/Irc.php b/extensions/command/bot/Irc.php
index 9d16eeb..5b755a1 100644
--- a/extensions/command/bot/Irc.php
+++ b/extensions/command/bot/Irc.php
@@ -1,4 +1,10 @@
<?php
+/**
+ * Lithium: the most rad php framework
+ *
+ * @copyright Copyright 2009, Union of RAD (http://union-of-rad.org)
+ * @license http://opensource.org/licenses/bsd-license.php The BSD License
+ */
namespace li3_bot\extensions\command\bot;
diff --git a/extensions/command/bot/Plugin.php b/extensions/command/bot/Plugin.php
index a2e8a3d..3de961c 100644
--- a/extensions/command/bot/Plugin.php
+++ b/extensions/command/bot/Plugin.php
@@ -1,4 +1,10 @@
<?php
+/**
+ * Lithium: the most rad php framework
+ *
+ * @copyright Copyright 2009, Union of RAD (http://union-of-rad.org)
+ * @license http://opensource.org/licenses/bsd-license.php The BSD License
+ */
namespace li3_bot\extensions\command\bot;
diff --git a/extensions/command/bot/plugins/Feed.php b/extensions/command/bot/plugins/Feed.php
index 32f0e00..4a77deb 100644
--- a/extensions/command/bot/plugins/Feed.php
+++ b/extensions/command/bot/plugins/Feed.php
@@ -1,4 +1,10 @@
<?php
+/**
+ * Lithium: the most rad php framework
+ *
+ * @copyright Copyright 2009, Union of RAD (http://union-of-rad.org)
+ * @license http://opensource.org/licenses/bsd-license.php The BSD License
+ */
namespace li3_bot\extensions\command\bot\plugins;
diff --git a/extensions/command/bot/plugins/Logging.php b/extensions/command/bot/plugins/Logging.php
index 7b7ed9a..e1b2dd2 100644
--- a/extensions/command/bot/plugins/Logging.php
+++ b/extensions/command/bot/plugins/Logging.php
@@ -1,4 +1,10 @@
<?php
+/**
+ * Lithium: the most rad php framework
+ *
+ * @copyright Copyright 2009, Union of RAD (http://union-of-rad.org)
+ * @license http://opensource.org/licenses/bsd-license.php The BSD License
+ */
namespace li3_bot\extensions\command\bot\plugins;
diff --git a/extensions/command/bot/plugins/Tell.php b/extensions/command/bot/plugins/Tell.php
index 4bd61d4..61abd0a 100644
--- a/extensions/command/bot/plugins/Tell.php
+++ b/extensions/command/bot/plugins/Tell.php
@@ -1,4 +1,10 @@
<?php
+/**
+ * Lithium: the most rad php framework
+ *
+ * @copyright Copyright 2009, Union of RAD (http://union-of-rad.org)
+ * @license http://opensource.org/licenses/bsd-license.php The BSD License
+ */
namespace li3_bot\extensions\command\bot\plugins;
diff --git a/models/Feed.php b/models/Feed.php
index 8fead77..ac32b03 100644
--- a/models/Feed.php
+++ b/models/Feed.php
@@ -1,4 +1,10 @@
<?php
+/**
+ * Lithium: the most rad php framework
+ *
+ * @copyright Copyright 2009, Union of RAD (http://union-of-rad.org)
+ * @license http://opensource.org/licenses/bsd-license.php The BSD License
+ */
namespace li3_bot\models;
@@ -95,7 +101,9 @@ class Feed extends \lithium\core\StaticObject {
$replace = array("#", "\r\n", "\n");
$ments = array("", ": ", ": ");
foreach ($items as $item) {
- $description = str_replace($replace, $ments, strip_tags((string)$item['item']['description']));
+ $description = str_replace(
+ $replace, $ments, strip_tags(join(' ', (array)$item['item']['description']))
+ );
if (strlen($description) > 50) {
$description = substr($description, 0, 50);
}
diff --git a/models/Log.php b/models/Log.php
index 378a533..09cbd21 100644
--- a/models/Log.php
+++ b/models/Log.php
@@ -1,4 +1,10 @@
<?php
+/**
+ * Lithium: the most rad php framework
+ *
+ * @copyright Copyright 2009, Union of RAD (http://union-of-rad.org)
+ * @license http://opensource.org/licenses/bsd-license.php The BSD License
+ */
namespace li3_bot\models;
diff --git a/models/Tell.php b/models/Tell.php
index 7585cb8..7d30255 100644
--- a/models/Tell.php
+++ b/models/Tell.php
@@ -1,4 +1,10 @@
<?php
+/**
+ * Lithium: the most rad php framework
+ *
+ * @copyright Copyright 2009, Union of RAD (http://union-of-rad.org)
+ * @license http://opensource.org/licenses/bsd-license.php The BSD License
+ */
namespace li3_bot\models;
diff --git a/tests/cases/extensions/command/bot/IrcTest.php b/tests/cases/extensions/command/bot/IrcTest.php
index 828ed7a..91da070 100644
--- a/tests/cases/extensions/command/bot/IrcTest.php
+++ b/tests/cases/extensions/command/bot/IrcTest.php
@@ -1,4 +1,10 @@
<?php
+/**
+ * Lithium: the most rad php framework
+ *
+ * @copyright Copyright 2009, Union of RAD (http://union-of-rad.org)
+ * @license http://opensource.org/licenses/bsd-license.php The BSD License
+ */
namespace li3_bot\tests\cases\extensions\command\bot;
diff --git a/tests/cases/extensions/command/bot/plugins/FeedTest.php b/tests/cases/extensions/command/bot/plugins/FeedTest.php
index e0a8f7c..18e6bac 100644
--- a/tests/cases/extensions/command/bot/plugins/FeedTest.php
+++ b/tests/cases/extensions/command/bot/plugins/FeedTest.php
@@ -1,4 +1,10 @@
<?php
+/**
+ * Lithium: the most rad php framework
+ *
+ * @copyright Copyright 2009, Union of RAD (http://union-of-rad.org)
+ * @license http://opensource.org/licenses/bsd-license.php The BSD License
+ */
namespace li3_bot\tests\cases\extensions\command\bot\plugins;
diff --git a/tests/cases/extensions/command/bot/plugins/TellTest.php b/tests/cases/extensions/command/bot/plugins/TellTest.php
index afc3c21..a9cd5a3 100644
--- a/tests/cases/extensions/command/bot/plugins/TellTest.php
+++ b/tests/cases/extensions/command/bot/plugins/TellTest.php
@@ -1,4 +1,10 @@
<?php
+/**
+ * Lithium: the most rad php framework
+ *
+ * @copyright Copyright 2009, Union of RAD (http://union-of-rad.org)
+ * @license http://opensource.org/licenses/bsd-license.php The BSD License
+ */
namespace li3_bot\tests\cases\extensions\command\bot\plugins;
diff --git a/tests/cases/models/FeedTest.php b/tests/cases/models/FeedTest.php
index 6408fd3..afe42da 100644
--- a/tests/cases/models/FeedTest.php
+++ b/tests/cases/models/FeedTest.php
@@ -1,4 +1,10 @@
<?php
+/**
+ * Lithium: the most rad php framework
+ *
+ * @copyright Copyright 2009, Union of RAD (http://union-of-rad.org)
+ * @license http://opensource.org/licenses/bsd-license.php The BSD License
+ */
namespace li3_bot\tests\cases\models;
diff --git a/tests/cases/models/LogTest.php b/tests/cases/models/LogTest.php
index 1050082..64337a8 100644
--- a/tests/cases/models/LogTest.php
+++ b/tests/cases/models/LogTest.php
@@ -1,4 +1,10 @@
<?php
+/**
+ * Lithium: the most rad php framework
+ *
+ * @copyright Copyright 2009, Union of RAD (http://union-of-rad.org)
+ * @license http://opensource.org/licenses/bsd-license.php The BSD License
+ */
namespace li3_bot\tests\cases\models;
@@ -19,15 +25,7 @@ class LogTest extends \lithium\test\Unit {
}
public function tearDown() {
- $rmdir = function($value) use( &$rmdir) {
- $result = is_file($value) ? unlink($value) : null;
- if ($result == null && is_dir($value)) {
- $result = array_filter(glob($value . '/*'), $rmdir);
- rmdir($value);
- }
- return false;
- };
- $rmdir(MockLog::$path);
+ $this->_cleanUp();
}
public function testSaveAndFind() {
diff --git a/tests/cases/models/TellTest.php b/tests/cases/models/TellTest.php
index 4d5484c..2ea3de4 100644
--- a/tests/cases/models/TellTest.php
+++ b/tests/cases/models/TellTest.php
@@ -1,4 +1,10 @@
<?php
+/**
+ * Lithium: the most rad php framework
+ *
+ * @copyright Copyright 2009, Union of RAD (http://union-of-rad.org)
+ * @license http://opensource.org/licenses/bsd-license.php The BSD License
+ */
namespace li3_bot\tests\cases\models;