Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/3.0' into 3.0-dsn-support
Browse files Browse the repository at this point in the history
* origin/3.0: (172 commits)
  Consolidate doc block headings.
  Adding a test for cakephp/cakephp#5019 the plugin view file path
  Fixing the view file loading for plugins in View/View.php
  Make method name better represent what it is going to do.
  Don't mutate cwd.
  More doc block corrections.
  Cosolidate doc block headers
  Add FlashComponent property to PHPDoc for Controller class
  Fix doubly inflected variable names in controller task.
  Use chdir() instead of calling multiple commands.
  Add missing 'b' to radio docs
  Fix FormHelper::radio() options docs
  Add test case for quoted strings
  Fix issue in PoFileParser where only slashes from translations of type array are stripped.
  Remove for attributes for other group type inputs.
  Remove meaningless and possibly wrong for attr.
  Fix missing label elements in input(type=radio)
  Fix radio widget and label=false.
  Fix input() making multiple checkboxes.
  Not using union, but OR conditions
  ...
  • Loading branch information
AD7six committed Oct 31, 2014
2 parents 5455c6c + 758feb3 commit 175d251
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions EntityTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public function __unset($property) {
* with one call by passing a hashed array as properties in the form of
* property => value pairs
*
* ## Example:
* ### Example:
*
* {{{
* $entity->set(['name' => 'andrew', 'id' => 1]);
Expand Down Expand Up @@ -543,7 +543,7 @@ public function dirty($property = null, $isDirty = null) {
return isset($this->_dirty[$property]);
}

if (!$isDirty) {
if ($isDirty === false) {
unset($this->_dirty[$property]);
return false;
}
Expand Down Expand Up @@ -733,7 +733,7 @@ protected function _readError($object, $path = null) {
*
* {{{
* $entity->accessible('id', true); // Mark id as not protected
* $entity->accessible('author_id', true); // Mark author_id as protected
* $entity->accessible('author_id', false); // Mark author_id as protected
* $entity->accessible(['id', 'user_id'], true); // Mark both properties as accessible
* $entity->accessible('*', false); // Mark all properties as protected
* }}}
Expand Down Expand Up @@ -777,7 +777,7 @@ public function accessible($property, $set = null) {
}

/**
* Returns the alias of the repository from wich this entity came from.
* Returns the alias of the repository from which this entity came from.
*
* If called with no arguments, it returns the alias of the repository
* this entity came from if it is known.
Expand Down
6 changes: 3 additions & 3 deletions QueryTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ public function getIterator() {
* - When the cached data is stale/missing the result set will be cached as the query
* is executed.
*
* ## Usage
* ### Usage
*
* {{{
* // Simple string key + config
Expand Down Expand Up @@ -193,7 +193,7 @@ public function eagerLoaded($value = null) {
* Will return either the results set through setResult(), or execute this query
* and return the ResultSetDecorator object ready for streaming of results.
*
* ResultSetDecorator is a travesable object that implements the methods found
* ResultSetDecorator is a traversable object that implements the methods found
* on Cake\Collection\Collection.
*
* @return \Cake\Datasource\ResultSetInterface
Expand Down Expand Up @@ -339,7 +339,7 @@ public function first() {
* Returns an array with the custom options that were applied to this query
* and that were not already processed by another method in this class.
*
* ###Example:
* ### Example:
*
* {{{
* $query->applyOptions(['doABarrelRoll' => true, 'fields' => ['id', 'name']);
Expand Down
2 changes: 1 addition & 1 deletion RepositoryInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function find($type = 'all', $options = []);
* Returns a single record after finding it by its primary key, if no record is
* found this method throws an exception.
*
* ###Example:
* ### Example:
*
* {{{
* $id = 10;
Expand Down
2 changes: 1 addition & 1 deletion ResultSetDecorator.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class ResultSetDecorator extends Collection implements ResultSetInterface {
* @return int
*/
public function count() {
if ($this->getInnerIterator() instanceof Countable) {
if ($this->getInnerIterator() instanceof \Countable) {
return $this->getInnerIterator()->count();
}

Expand Down

0 comments on commit 175d251

Please sign in to comment.