doc block updates and timeline helper

dereuromark · Sep 16, 2013 · 1527cce · 1527cce
1 parent 11d6430
commit 1527cce
Show file tree

Hide file tree

Showing 17 changed files with 328 additions and 28 deletions.
diff --git a/Lib/Cache/Engine/MemcachedEngine.php b/Lib/Cache/Engine/MemcachedEngine.php
@@ -13,7 +13,6 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.Cache.Engine
  * @since         CakePHP(tm) v 1.2.0.4933
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
@@ -31,7 +30,6 @@
  * (if memcached extension compiled with --enable-igbinary).
  * Compressed keys can also be incremented/decremented.
  *
- * @package       Cake.Cache.Engine
  */
 class MemcachedEngine extends CacheEngine {
 

diff --git a/Test/Case/Controller/Component/Auth/DirectAuthenticateTest.php b/Test/Case/Controller/Component/Auth/DirectAuthenticateTest.php
@@ -14,7 +14,6 @@
 /**
  * Test case for DirectAuthentication
  *
- * @package       Cake.Test.Case.Controller.Component.Auth
  */
 class DirectAuthenticateTest extends CakeTestCase {
 

diff --git a/Test/Case/Controller/Component/Auth/TinyAuthorizeTest.php b/Test/Case/Controller/Component/Auth/TinyAuthorizeTest.php
@@ -13,7 +13,6 @@
 /**
  * Test case for DirectAuthentication
  *
- * @package Test.Case.Controller.Component.Auth
  */
 class TinyAuthorizeTest extends MyCakeTestCase {
 

diff --git a/Test/Case/Controller/Component/AutoLoginComponentTest.php b/Test/Case/Controller/Component/AutoLoginComponentTest.php
@@ -6,8 +6,6 @@
 /**
  * Short description for class.
  *
- * @package cake.tests
- * @subpackage cake.tests.cases.libs.controller.components
  */
 class AutoLoginComponentTest extends CakeTestCase {
 
@@ -98,8 +96,6 @@ public function testLogin() {
 /**
  * Short description for class.
  *
- * @package cake.tests
- * @subpackage cake.tests.cases.libs.controller.components
  */
 class AutoLoginTestController extends Controller {
 	/**

diff --git a/Test/Case/Model/Behavior/SluggedBehaviorTest.php b/Test/Case/Model/Behavior/SluggedBehaviorTest.php
@@ -18226,8 +18226,6 @@ public function testDuplicateWithLengthRestriction() {
  * MessageSlugged class
  *
  * @uses CakeTestModel
- * @package mi
- * @subpackage mi.tests.cases.behaviors
  */
 class MessageSlugged extends CakeTestModel {
 

diff --git a/Test/Case/View/Helper/DatetimeHelperTest.php b/Test/Case/View/Helper/DatetimeHelperTest.php
@@ -7,8 +7,6 @@
 /**
  * Datetime Test Case
  *
- * @package cake.tests
- * @subpackage cake.tests.cases.libs.view.helpers
  */
 class DatetimeHelperTest extends MyCakeTestCase {
 

diff --git a/Test/Case/View/Helper/FormExtHelperTest.php b/Test/Case/View/Helper/FormExtHelperTest.php
@@ -194,8 +194,6 @@ public function testNormalize() {
 /**
  * Contact class
  *
- * @package	   cake
- * @package       Cake.Test.Case.View.Helper
  */
 class ContactExt extends CakeTestModel {
 

diff --git a/Test/Case/View/Helper/QrCodeHelperTest.php b/Test/Case/View/Helper/QrCodeHelperTest.php
@@ -16,8 +16,6 @@
 /**
  * QrCode Test Case
  *
- * @package cake.tests
- * @subpackage cake.tests.cases.libs.view.helpers
  */
 class QrCodeHelperTest extends MyCakeTestCase {
 /**

diff --git a/Test/Case/View/Helper/TimelineHelperTest.php b/Test/Case/View/Helper/TimelineHelperTest.php
@@ -0,0 +1,71 @@
+<?php
+
+App::uses('TimelineHelper', 'Tools.View/Helper');
+App::uses('MyCakeTestCase', 'Tools.TestSuite');
+App::uses('HtmlHelper', 'View/Helper');
+App::uses('View', 'View');
+
+/**
+ * Timeline Helper Test Case
+ */
+class TimelineHelperTest extends MyCakeTestCase {
+
+	public $Timeline;
+
+	/**
+	 * TimelineHelperTest::setUp()
+	 *
+	 * @return void
+	 */
+	public function setUp() {
+		parent::setUp();
+
+		$this->Timeline = new TimelineTestHelper(new View(null));
+		$this->Timeline->Html = new HtmlHelper(new View(null));
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testAddItem() {
+		$data = array(
+			'start' => '',
+			'content' => '',
+		);
+		$this->Timeline->addItem($data);
+		$items = $this->Timeline->items();
+		$this->assertSame(1, count($items));
+
+		$data = array(
+			array(
+				'start' => '',
+				'content' => '',
+			),
+			array(
+				'start' => '',
+				'content' => '',
+			)
+		);
+		$this->Timeline->addItems($data);
+		$items = $this->Timeline->items();
+		$this->assertSame(3, count($items));
+	}
+
+	public function tearDown() {
+		parent::tearDown();
+
+		unset($this->Timeline);
+	}
+
+}
+
+class TimelineTestHelper extends TimelineHelper {
+
+	/**
+	 * @return array
+	 */
+	public function items() {
+		return $this->_items;
+	}
+
+}
diff --git a/Test/Fixture/MessageFixture.php b/Test/Fixture/MessageFixture.php
@@ -13,8 +13,6 @@
  *
  * @copyright Copyright (c) 2008, Andy Dawson
  * @link www.ad7six.com
- * @package mi
- * @subpackage mi.tests.fixtures
  * @since v 1.0
  * @modifiedBy $LastChangedBy$
  * @lastModified $Date$

diff --git a/Test/Fixture/SoftDeletePostFixture.php b/Test/Fixture/SoftDeletePostFixture.php
@@ -2,8 +2,6 @@
 /**
  * Short description for class.
  *
- * @package cake
- * @subpackage cake.tests.fixtures
  */
 class SoftDeletePostFixture extends CakeTestFixture {
 

diff --git a/View/Helper/CaptchaHelper.php b/View/Helper/CaptchaHelper.php
@@ -11,7 +11,6 @@
  *
  * @author Mark Scherer
  * @link http://www.dereuromark.de
- * @package tools plugin
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 

diff --git a/View/Helper/FormExtHelper.php b/View/Helper/FormExtHelper.php
@@ -92,7 +92,9 @@ public function postLink($title, $url = null, $options = array(), $confirmMessag
 	}
 
 	/**
-	 * Overwrite FormHelper::create() to allow disabling browser html5 validation via configs
+	 * Overwrite FormHelper::create() to allow disabling browser html5 validation via configs.
+	 * It also grabs inputDefaults from your Configure if set.
+	 * Also adds the class "form-control" to all inputs for better control over them.
 	 *
 	 * @param string $model
 	 * @param array $options
@@ -102,6 +104,14 @@ public function create($model = null, $options = array()) {
 		if (Configure::read('Validation.browserAutoRequire') === false && !isset($options['novalidate'])) {
 			$options['novalidate'] = true;
 		}
+		if (!isset($options['inputDefaults'])) {
+			$options['inputDefaults'] = array();
+		}
+		$options['inputDefaults'] += (array)Configure::read('Form.inputDefaults');
+		$options['inputDefaults'] += array(
+			'class' => array('form-control'),
+		);
+
 		return parent::create($model, $options);
 	}
 

diff --git a/View/Helper/GoogleMapV3Helper.php b/View/Helper/GoogleMapV3Helper.php
@@ -15,7 +15,6 @@
  *
  * @author Mark Scherer
  * @link http://www.dereuromark.de/2010/12/21/googlemapsv3-cakephp-helper/
- * @package tools plugin
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  *
  * fixed brackets, spacesToTabs, indends, some improvements, supports multiple maps now.
@@ -481,7 +480,7 @@ public function _initialLocation() {
 	 *
 	 * @param array $options
 	 * - lat and lng or address (to geocode on demand, not recommended, though)
-	 * - title, content, icon, directions (optional)
+	 * - title, content, icon, directions, maxWidth (optional)
 	 * @return int $markerCount or false on failure
 	 * @throws CakeException
 	 * 2010-12-18 ms

diff --git a/View/Helper/GravatarHelper.php b/View/Helper/GravatarHelper.php
@@ -8,8 +8,6 @@
  *
  * @copyright Copyright 2009-2010, Graham Weldon (http://grahamweldon.com)
  * @license http://www.opensource.org/licenses/mit-license.php The MIT License
- * @package goodies
- * @subpackage goodies.views.helpers
  *
  * hashtype now always md5
  * 2010-12-21 ms
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,6 @@ @@
     /**
      * Test case for DirectAuthentication
      *
-     * @package       Cake.Test.Case.Controller.Component.Auth
      */
     class DirectAuthenticateTest extends CakeTestCase {
@@ Expand Down @@