Merge remote-tracking branch 'upstream/master'

en/appendices/new-features-in-cakephp-2-1.rst

@@ -193,7 +193,7 @@ it in ``engine`` key::
     // Utility/MyAwesomeStringClass.php
     class MyAwesomeStringClass extends String {
         // my truncate is better than yours
-        public function static truncate($text, $length = 100, $options = array()) {
+        public static function truncate($text, $length = 100, $options = array()) {
             return null;
         }
     }

en/console-and-shells/schema-management-and-migrations.rst

@@ -100,6 +100,200 @@ correct datasource, lest they fallback to their default datasources::
         // Do things with articles.
     }
 
+Writing CakePHP Schema by Hand
+==============================
+
+The CakeSchema class is the base class for all database schemas. Each schema
+class is able to generate a set of tables.  The schema shell console class
+``SchemaShell`` in the ``lib/Cake/Console/Command`` directory interprets command
+line, and base schema class can read from the database, or generate the database
+table.
+
+CakeSchema can now locate, read and write schema files to plugins. The
+SchemaShell also exposes this functionality.
+
+CakeSchema also supports ``tableParameters``. Table Parameters are non column
+specific table information such as collation, charset, comments, and table
+engine type. Each Dbo implements the tableParameters they support.
+
+Example
+-------
+
+Here is a full example from the acl class ::
+
+    /**
+     * ACO - Access Control Object - Something that is wanted
+     */
+        public $acos = array(
+            'id' => array(
+                'type' => 'integer',
+                'null' => false,
+                'default' => null,
+                'length' => 10,
+                'key' => 'primary'
+            ),
+            'parent_id' => array(
+                'type' => 'integer',
+                'null' => true,
+                'default' => null,
+                'length' => 10
+            ),
+            'model' => array('type' => 'string', 'null' => true),
+            'foreign_key' => array(
+                'type' => 'integer',
+                'null' => true,
+                'default' => null,
+                'length' => 10
+            ),
+            'alias' => array('type' => 'string', 'null' => true),
+            'lft' => array(
+                'type' => 'integer',
+                'null' => true,
+                'default' => null,
+                'length' => 10
+            ),
+            'rght' => array(
+                'type' => 'integer',
+                'null' => true,
+                'default' => null,
+                'length' => 10
+            ),
+            'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
+        );
+
+
+Columns
+-------
+Each column is encoded as a key value associative array.
+The field name is the key of the field, the value is another array with some of
+the following attributes. 
+
+Example column ::
+
+    'id' => array(
+        'type' => 'integer',
+        'null' => false,
+        'default' => null,
+        'length' => 10,
+        'key' => 'primary'
+     ),
+
+key
+    The ``primary`` key defines the primary key index.
+
+null
+    Is the field nullable?
+
+default
+    What is the default value of the field?
+
+limit
+    The limit of the type of the field.
+
+length
+    What is the length of the field?
+
+type
+    One of the following types
+
+    * integer
+    * date
+    * time
+    * datetime
+    * timestamp
+    * boolean
+    * biginteger
+    * float
+    * string
+    * text
+    * binary
+
+
+Table key `indexes`
+===================
+The key name `indexes` is put in the table array instead of a field name.
+
+column
+    This is either a single column name or an array of columns.
+
+    e.g. Single ::
+
+        'indexes' => array(
+        'PRIMARY' => array(
+             'column' => 'id',
+             'unique' => 1
+            )
+        )
+
+    e.g. Multiple ::
+
+        'indexes' => array(
+        'AB_KEY' => array(
+            'column' => array(
+                 'a_id', 
+                 'b_id'), 
+             'unique' => 1
+            )
+        )
+
+
+unique
+    If the index is unique, set this to 1, otherwise 0.
+
+
+Table key `tableParameters`
+===========================
+
+tableParameters are supported only in MySQL.
+
+You can use tableParameters to set a variety of MySQL specific settings.
+
+
+-  ``engine`` Control the storage engine used for your tables.
+-  ``charset`` Control the character set used for tables.
+-  ``encoding`` Control the encoding used for tables.
+
+In addition to tableParameters MySQL dbo's implement
+``fieldParameters``. ``fieldParameters`` allow you to control MySQL
+specific settings per column.
+
+
+-  ``charset`` Set the character set used for a column
+-  ``encoding`` Set the encoding used for a column
+
+See below for examples on how to use table and field parameters in
+your schema files.
+
+**Using tableParameters in schema files**
+
+You use ``tableParameters`` just as you would any other key in a
+schema file. Much like ``indexes``::
+
+    var $comments => array(
+        'id' => array(
+          'type' => 'integer',
+          'null' => false,
+          'default' => 0,
+          'key' => 'primary'
+        ),
+        'post_id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+        'comment' => array('type' => 'text'),
+        'indexes' => array(
+            'PRIMARY' => array('column' => 'id', 'unique' => true),
+            'post_id' => array('column' => 'post_id'),
+        ),
+        'tableParameters' => array(
+            'engine' => 'InnoDB',
+            'charset' => 'latin1',
+            'collate' => 'latin1_general_ci'
+        )
+    );
+
+is an example of a table using ``tableParameters`` to set some
+database specific settings. If you use a schema file that contains
+options and features your database does not implement, those
+options will be ignored. 
+
 Migrations with CakePHP schema shell
 ====================================
 

en/core-libraries/components/security-component.rst

@@ -144,7 +144,7 @@ Form tampering prevention
 =========================
 
 By default ``SecurityComponent`` prevents users from tampering with forms. It
-does this by working with FormHelper and tracking which files are in a form. It
+does this by working with FormHelper and tracking which fields are in a form. It
 also keeps track of the values of hidden input elements. All of this data is
 combined and turned into a hash. When a form is submitted, SecurityComponent
 will use the POST data to build the same structure and compare the hash.

en/core-utility-libraries/hash.rst

@@ -625,7 +625,8 @@ Attribute Matching Types
 
 .. php:staticmethod:: apply(array $data, $path, $function)
 
-    Apply a callback to a set of extracted values using $function. The function will get the extracted values as the first argument.
+    Apply a callback to a set of extracted values using $function. The function
+    will get the extracted values as the first argument.
 
 .. php:staticmethod:: sort(array $data, $path, $dir, $type = 'regular')
 

en/models/retrieving-your-data.rst

@@ -40,6 +40,7 @@ It's also possible to add and use other parameters, as is made use
 of by some find types, behaviors and of course possibly with your
 own model methods.
 
+If your find operation fails to match any records you will get an empty array.
 
 .. _model-find-first:
 

en/tutorials-and-examples/blog-auth-example/auth.rst

@@ -366,7 +366,7 @@ and add the following content::
 
         // The owner of a post can edit and delete it
         if (in_array($this->action, array('edit', 'delete'))) {
-            $postId = $this->request->params['pass'][0];
+            $postId = (int) $this->request->params['pass'][0];
             if ($this->Post->isOwnedBy($postId, $user['id'])) {
                 return true;
             }

en/views/themes.rst

@@ -79,7 +79,7 @@ directories in ``app/webroot`` with paths matching those used by CakePHP.
 -  ``app/Plugin/DebugKit/webroot/js/my_file.js`` becomes
    ``app/webroot/debug_kit/js/my_file.js``
 -  ``app/View/Themed/Navy/webroot/css/navy.css`` becomes
-   ``app/webroot/theme/Navy/css/navy.css``
+   ``app/webroot/themed/Navy/css/navy.css``
 
 
 .. meta::

fr/appendices/new-features-in-cakephp-2-1.rst

@@ -213,7 +213,7 @@ classe dans votre dossier ``APP/Utility``, par exemple:
     // Utility/MyAwesomeStringClass.php
     class MyAwesomeStringClass extends String {
         // mon truchement est meilleur que les votres
-        public function static truncate($text, $length = 100, $options = array()) {
+        public static function truncate($text, $length = 100, $options = array()) {
             return null;
         }
     }