Fixed CS errors.

cakephp · Dec 4, 2013 · b433798 · b433798
1 parent 1879224
commit b433798
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 10 deletions.
diff --git a/Cake/Cache/CacheEngine.php b/Cake/Cache/CacheEngine.php
@@ -200,6 +200,7 @@ public function key($key) {
  *
  * @param string $key the key passed over
  * @return mixed string $key or false
+ * @throws InvalidArgumentException If key's value is empty
  */
 	protected function _key($key) {
 		$key = $this->key($key);

diff --git a/Cake/Controller/Component/PaginatorComponent.php b/Cake/Controller/Component/PaginatorComponent.php
@@ -129,7 +129,6 @@ class PaginatorComponent extends Component {
  * @param Table $object The table to paginate.
  * @param array $settings The settings/configuration used for pagination.
  * @return array Query results
- * @throws Cake\Error\MissingModelException
  * @throws Cake\Error\NotFoundException
  */
 	public function paginate($object, array $settings = []) {

diff --git a/Cake/ORM/Table.php b/Cake/ORM/Table.php
@@ -29,8 +29,8 @@
 use Cake\ORM\BehaviorRegistry;
 use Cake\ORM\Entity;
 use Cake\ORM\Error\MissingEntityException;
-use Cake\Validation\Validator;
 use Cake\Utility\Inflector;
+use Cake\Validation\Validator;
 
 /**
  * Represents a single database table.
@@ -1274,7 +1274,7 @@ public function callFinder($type, Query $query, $options = []) {
  * @throws Cake\Error\Exception when there are missing arguments, or when
  *  and & or are combined.
  */
-	public function _dynamicFinder($method, $args) {
+	protected function _dynamicFinder($method, $args) {
 		$method = Inflector::underscore($method);
 		preg_match('/^find_([\w]+)_by_/', $method, $matches);
 		if (empty($matches)) {

diff --git a/Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php b/Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php
@@ -14,8 +14,8 @@
  */
 namespace Cake\Test\TestCase\Controller\Component;
 
-use Cake\Controller\Component\PaginatorComponent;
 use Cake\Controller\ComponentRegistry;
+use Cake\Controller\Component\PaginatorComponent;
 use Cake\Controller\Controller;
 use Cake\Core\Configure;
 use Cake\Database\ConnectionManager;

diff --git a/Cake/Test/TestCase/Validation/ValidationRuleTest.php b/Cake/Test/TestCase/Validation/ValidationRuleTest.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 2.2.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\ORM\Validaton;
+namespace Cake\Test\TestCase\Validation;
 
 use Cake\TestSuite\TestCase;
 use Cake\Validation\ValidationRule;

diff --git a/Cake/Test/TestCase/Validation/ValidationSetTest.php b/Cake/Test/TestCase/Validation/ValidationSetTest.php
@@ -16,9 +16,9 @@
  */
 namespace Cake\Test\TestCase\Validation;
 
+use Cake\TestSuite\TestCase;
 use Cake\Validation\ValidationRule;
 use Cake\Validation\ValidationSet;
-use Cake\TestSuite\TestCase;
 
 /**
  * ValidationSetTest

diff --git a/Cake/Test/TestCase/Validation/ValidatorTest.php b/Cake/Test/TestCase/Validation/ValidatorTest.php
@@ -197,7 +197,6 @@ public function testIsEmptyAllowed() {
 		$this->assertFalse($validator->isEmptyAllowed('title', true));
 	}
 
-
 /**
  * Tests errors generated when a field is not allowed to be empty
  *
@@ -324,7 +323,7 @@ public function testErrorsFromCustomProvider() {
 		$errors = $validator->errors(['email' => '!', 'title' => 'bar']);
 		$expected = [
 			'email' => ['alpha' => 'The provided value is invalid'],
-			'title' => ['cool' =>  "That ain't cool, yo"]
+			'title' => ['cool' => "That ain't cool, yo"]
 		];
 		$this->assertEquals($expected, $errors);
 	}
@@ -357,7 +356,7 @@ public function testMethodsWithExtraArguments() {
 		$validator->provider('thing', $thing);
 		$errors = $validator->errors(['email' => '!', 'title' => 'bar']);
 		$expected = [
-			'title' => ['cool' =>  "That ain't cool, yo"]
+			'title' => ['cool' => "That ain't cool, yo"]
 		];
 		$this->assertEquals($expected, $errors);
 	}

diff --git a/Cake/Validation/Validator.php b/Cake/Validation/Validator.php
@@ -177,7 +177,7 @@ public function offsetGet($field) {
 	public function offsetSet($field, $rules) {
 		if (!$rules instanceof ValidationSet) {
 			$set = new ValidationSet;
-			foreach((array)$rules as $name => $rule) {
+			foreach ((array)$rules as $name => $rule) {
 				$set->add($name, $rule);
 			}
 		}