Merge branch 'master' of github.com:burzum/ratings into develop

Conflicts: Controller/Component/RatingsComponent.php Test/Case/Component/RatingsComponentTest.php Test/Case/Helper/RatingHelperTest.php View/Helper/RatingHelper.php readme.md
CakeDC · Apr 13, 2014 · 09c9501 · 09c9501
2 parents 7f766ce + 0b00204
commit 09c9501
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 36 deletions.
diff --git a/Config/Schema/schema.php b/Config/Schema/schema.php
@@ -24,13 +24,6 @@
 
 class RatingsSchema extends CakeSchema {
 
-/**
- * Schema name
- *
- * @var string
- * @access public
- */
-	public $name = 'Ratings';
 
 /**
  * Before callback

diff --git a/Controller/RatingsAppController.php b/Controller/RatingsAppController.php
@@ -8,6 +8,7 @@
  * @copyright Copyright 2010 - 1013 - 1013, Cake Development Corporation (http://cakedc.com)
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+App::uses('AppController', 'Controller');
 
 /**
  * CakePHP Ratings Plugin

diff --git a/Model/Behavior/RatableBehavior.php b/Model/Behavior/RatableBehavior.php
@@ -8,6 +8,7 @@
  * @copyright Copyright 2010 - 1013 - 1013, Cake Development Corporation (http://cakedc.com)
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+App::uses('ModelBehavior', 'Model');
 
 /**
  * CakePHP Ratings Plugin

diff --git a/Model/Rating.php b/Model/Rating.php
@@ -8,6 +8,7 @@
  * @copyright Copyright 2010 - 1013 - 1013, Cake Development Corporation (http://cakedc.com)
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+App::uses('RatingsAppModel', 'Ratings.Model');
 
 /**
  * CakePHP Ratings Plugin
@@ -19,13 +20,6 @@
  */
 class Rating extends RatingsAppModel {
 
-/**
- * Name
- *
- * @var string $name
- */
-	public $name = 'Rating';
-
 /**
  * Validation rules
  *

diff --git a/Model/RatingsAppModel.php b/Model/RatingsAppModel.php
@@ -8,6 +8,7 @@
  * @copyright Copyright 2010 - 1013 - 1013, Cake Development Corporation (http://cakedc.com)
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+App::uses('AppModel', 'Model');
 
 /**
  * CakePHP Ratings Plugin

diff --git a/Test/Case/AllTestsTest.php b/Test/Case/AllTestsTest.php
@@ -0,0 +1,16 @@
+<?php
+
+class AllTestsTest extends PHPUnit_Framework_TestSuite {
+
+/**
+ * suite method, defines tests for this suite.
+ *
+ * @return void
+ */
+	public static function suite() {
+		$suite = new CakeTestSuite('All Tests');
+		$suite->addTestDirectoryRecursive(App::pluginPath('Ratings') . 'Test' . DS . 'Case' . DS);
+
+		return $suite;
+	}
+}
diff --git a/Test/Case/Model/RatingTest.php b/Test/Case/Model/RatingTest.php
@@ -17,9 +17,7 @@
  * @package 	ratings
  * @subpackage 	ratings.tests.cases.models
  */
-
-App::uses('Model', 'Model');
-class RatingTestCase extends CakeTestCase {
+class RatingTest extends CakeTestCase {
 
 /**
  * Rating Model
@@ -52,7 +50,7 @@ class RatingTestCase extends CakeTestCase {
  * @return void
  */
 	public function startTest($method) {
-		Configure::write('App.UserClass', null); 
+		Configure::write('App.UserClass', null);
 		parent::startTest($method);
 		$this->Rating = ClassRegistry::init('Ratings.Rating');
 	}

diff --git a/Test/Fixture/ArticleFixture.php b/Test/Fixture/ArticleFixture.php
@@ -19,14 +19,6 @@
  */
 class ArticleFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'AnotherArticle'
- * @access public
- */
-	public $name = 'Article';
-
 /**
  * fields property
  *

diff --git a/Test/Fixture/PostFixture.php b/Test/Fixture/PostFixture.php
@@ -19,14 +19,6 @@
  */
 class PostFixture extends CakeTestFixture {
 
-/**
- * name property
- *
- * @var string 'AnotherPost'
- * @access public
- */
-	public $name = 'Post';
-
 /**
  * fields property
  *

diff --git a/View/Layouts/json/default.ctp b/View/Layouts/json/default.ctp
@@ -9,7 +9,7 @@
  * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-<?php 
+<?php
 Configure::write('debug', 0);
-$status = (isset($status)) ? $status : 'success'; 
+$status = (isset($status)) ? $status : 'success';
 ?>{ "status" : "<?php echo $status?>", "data" : <?php echo $content_for_layout; ?> }